summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-02-15 03:19:45 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-02-15 03:19:45 +0000
commitbfc74c955328cf3e5fa74ef3028861524a73d60d (patch)
tree83ca411b144bf6bf4db059a4b0a474375f8b395f
parentb4533abdc41a6d6f02bbdce1fb691fb39e61e0cb (diff)
parentc0b2655f52bbb82cdba86b47ef179c4df5903767 (diff)
downloadplatform_system_libhidl-bfc74c955328cf3e5fa74ef3028861524a73d60d.tar.gz
platform_system_libhidl-bfc74c955328cf3e5fa74ef3028861524a73d60d.tar.bz2
platform_system_libhidl-bfc74c955328cf3e5fa74ef3028861524a73d60d.zip
Snap for 6210127 from c0b2655f52bbb82cdba86b47ef179c4df5903767 to rvc-release
Change-Id: I11301bbdf77497af6627858a79396132ac3d266d
-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",