commit 750364bd76be3714903f267e7a61de8fb6e69a8c
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Feb 14 10:56:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 10:56:18 2020 +0000
tree 59fb7562cfc55882a43c380b393baa1f3c0612f4
parent 8b27f9bc87c0b7f5f89d1c0a7b1488720daca9a8
parent 4f0d1e3294f1c1372d3af1e32aefdde5dc6d791e

Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks."

Android.bp

diff --git a/Android.bp b/Android.bp
index 5c783b8..8d907b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,6 +67,15 @@
     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,

libhidlmemory/Android.bp

diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 2f97d5d..e6b6b50 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -19,6 +19,11 @@
         enabled: true,
         support_system_process: true,
     },
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.neuralnetworks",
+        "test_com.android.neuralnetworks",
+    ],
     defaults: ["libhidl-defaults"],
     shared_libs: [
         "libbase",