commit 5aa42775fed2d57ff7721815b5f672f78c671997
author Bill Yi <byi@google.com> Wed Oct 24 14:47:13 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:47:13 2018 -0700
tree ee4b9a128a1bd2baf74473c9ee63bed88fe9b68a
parent 2ce8238c3a21536c7760bef9f880e28018b3fbb8
parent 4599e0381ee4f2162cc7a032c2e99376cd8bb7ed

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I8f843a9e18cc78203ef57259e92b60ffa2f511ed

1.0/Android.bp

diff --git a/1.0/Android.bp b/1.0/Android.bp
index a57f169..df422e5 100644
--- a/1.0/Android.bp
+++ b/1.0/Android.bp
@@ -21,6 +21,7 @@
     relative_install_path: "hw",
     proprietary: true,
     init_rc: ["android.hardware.neuralnetworks@1.0-service-hvx.rc"],
+    enabled: false,
     srcs: [
         "Device.cpp",
         "HexagonController.cpp",
@@ -36,6 +37,7 @@
     ],
     shared_libs: [
         "libbase",
+        "libcutils",
         "libdl",
         "libhardware",
         "libhidlbase",
@@ -45,6 +47,7 @@
         "libutils",
         "android.hardware.neuralnetworks@1.0",
         "android.hardware.neuralnetworks@1.1",
+        "android.hardware.neuralnetworks@1.2",
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
     ],