summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>2020-02-14 11:36:17 +0000
committerPrzemyslaw Szczepaniak <pszczepaniak@google.com>2020-02-14 11:36:17 +0000
commit4065edea29d4b6a6ac8d27e0fe1e63eaec232637 (patch)
tree59fb7562cfc55882a43c380b393baa1f3c0612f4
parent28337da5f707457cdfc1989fde47e03132bf3118 (diff)
parentabe3f34125b25945bfc60ef3c1e8c4f4d3f763f9 (diff)
downloadplatform_system_libhidl-4065edea29d4b6a6ac8d27e0fe1e63eaec232637.tar.gz
platform_system_libhidl-4065edea29d4b6a6ac8d27e0fe1e63eaec232637.tar.bz2
platform_system_libhidl-4065edea29d4b6a6ac8d27e0fe1e63eaec232637.zip
Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks." am: 750364bd76 am: abe3f34125
Change-Id: Ief6e2eccc0c033d35ae6b11d738023c4d106e7eb
-rw-r--r--Android.bp9
-rw-r--r--libhidlmemory/Android.bp5
2 files changed, 14 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 5c783b89..8d907b70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,6 +67,15 @@ cc_library {
host_supported: true,
recovery_available: true,
vendor_available: true,
+ apex_available: [
+ // TODO(b/137948090): not fully supported in APEX for certain usecases
+ // - large dependency sizes
+ // - VINTF manifest cannot be read from APEX
+ // - no testing story/infra for deprecation schedule
+ "//apex_available:platform",
+ "com.android.neuralnetworks",
+ "test_com.android.neuralnetworks",
+ ],
vndk: {
enabled: true,
support_system_process: true,
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 2f97d5df..e6b6b505 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -19,6 +19,11 @@ cc_library {
enabled: true,
support_system_process: true,
},
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.neuralnetworks",
+ "test_com.android.neuralnetworks",
+ ],
defaults: ["libhidl-defaults"],
shared_libs: [
"libbase",