summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>2020-02-14 11:48:42 +0000
committerPrzemyslaw Szczepaniak <pszczepaniak@google.com>2020-02-14 11:48:42 +0000
commitc0b2655f52bbb82cdba86b47ef179c4df5903767 (patch)
tree83ca411b144bf6bf4db059a4b0a474375f8b395f
parentceb1067a474a75cd67b6c83f25361d398c5d111f (diff)
parent4065edea29d4b6a6ac8d27e0fe1e63eaec232637 (diff)
downloadplatform_system_libhidl-c0b2655f52bbb82cdba86b47ef179c4df5903767.tar.gz
platform_system_libhidl-c0b2655f52bbb82cdba86b47ef179c4df5903767.tar.bz2
platform_system_libhidl-c0b2655f52bbb82cdba86b47ef179c4df5903767.zip
Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks." am: 750364bd76 am: abe3f34125 am: 4065edea29
Change-Id: I4ee097b004ec988339b0d24cc608fc3e80db234a
-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 eff5fdc4..da50c0a5 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",