commit c6bd2f42965b0406412599e28c3053b641af6b5e
author Steven Moreland <smoreland@google.com> Tue Oct 03 11:04:47 2017 -0700
committer Steven Moreland <smoreland@google.com> Tue Oct 03 11:04:47 2017 -0700
tree a86bea7372a7fcf2461b203fc78ec28f0eb87e93
parent 7fe35b2d4a24d6f346a1553e9152f951a1de6296

Support NN dev in O-MR1.

Remove downstream changes to their makefile
which can't be updated in MR1.

Test: pass
Change-Id: I7d621b0366a25d9cbeeb2a4c120d5dd6664ffa2a

neuralnetworks/1.0/Android.bp

diff --git a/neuralnetworks/1.0/Android.bp b/neuralnetworks/1.0/Android.bp
index 8f0b214..d7c3bbb 100644
--- a/neuralnetworks/1.0/Android.bp
+++ b/neuralnetworks/1.0/Android.bp
@@ -78,81 +78,3 @@
         "libutils",
     ],
 }
-
-genrule {
-    name: "android.hardware.neuralnetworks@1.0-adapter-helper_genc++",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0",
-    srcs: [
-        ":android.hardware.neuralnetworks@1.0_hal",
-    ],
-    out: [
-        "android/hardware/neuralnetworks/1.0/ADevice.cpp",
-        "android/hardware/neuralnetworks/1.0/AEvent.cpp",
-        "android/hardware/neuralnetworks/1.0/APreparedModel.cpp",
-    ],
-}
-
-genrule {
-    name: "android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0",
-    srcs: [
-        ":android.hardware.neuralnetworks@1.0_hal",
-    ],
-    out: [
-        "android/hardware/neuralnetworks/1.0/ADevice.h",
-        "android/hardware/neuralnetworks/1.0/AEvent.h",
-        "android/hardware/neuralnetworks/1.0/APreparedModel.h",
-    ],
-}
-
-
-cc_library {
-    name: "android.hardware.neuralnetworks@1.0-adapter-helper",
-    defaults: ["hidl-module-defaults"],
-    generated_sources: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++"],
-    generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"],
-    export_generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"],
-    vendor_available: true,
-    shared_libs: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "liblog",
-        "libutils",
-        "libcutils",
-        "libhidladapter",
-        "android.hardware.neuralnetworks@1.0",
-        "android.hidl.base@1.0-adapter-helper",
-    ],
-    export_shared_lib_headers: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libutils",
-        "libhidladapter",
-        "android.hardware.neuralnetworks@1.0",
-        "android.hidl.base@1.0-adapter-helper",
-    ],
-}
-
-genrule {
-    name: "android.hardware.neuralnetworks@1.0-adapter_genc++",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.neuralnetworks@1.0",
-    out: ["main.cpp"]
-}
-
-cc_test {
-    name: "android.hardware.neuralnetworks@1.0-adapter",
-    shared_libs: [
-        "libhidladapter",
-        "libhidlbase",
-        "libhidltransport",
-        "libutils",
-        "android.hardware.neuralnetworks@1.0",
-        "android.hardware.neuralnetworks@1.0-adapter-helper",
-    ],
-    generated_sources: ["android.hardware.neuralnetworks@1.0-adapter_genc++"],
-}