Revert "Making NN hardware interface libs "host supported""
Revert "Making NNAPI libraries and tests host supported"
Revert submission 1769046-neuralnetworks_host_build
Reason for revert: New Build Breakage
Reverted Changes:
Ib54d5c274:Making NNAPI libraries and tests host supported
I1d7c66516:Making NN hardware interface libs "host supported"...
Change-Id: I6f65774325889c50b9f8bbab13b557705419b6cf
diff --git a/neuralnetworks/1.2/utils/Android.bp b/neuralnetworks/1.2/utils/Android.bp
index 4eefb0f..41281ee 100644
--- a/neuralnetworks/1.2/utils/Android.bp
+++ b/neuralnetworks/1.2/utils/Android.bp
@@ -50,21 +50,10 @@
cflags: ["-DNN_DEBUGGABLE"],
},
},
- target: {
- host: {
- cflags: [
- "-D__INTRODUCED_IN(x)=",
- "-D__assert(a,b,c)=",
- // We want all the APIs to be available on the host.
- "-D__ANDROID_API__=10000",
- ],
- },
- },
}
cc_test {
name: "neuralnetworks_utils_hal_1_2_test",
- host_supported: true,
srcs: ["test/*.cpp"],
static_libs: [
"android.hardware.neuralnetworks@1.0",
@@ -87,12 +76,8 @@
"libhidlbase",
"libhidlmemory",
"liblog",
+ "libnativewindow",
"libutils",
],
- target: {
- android: {
- shared_libs: ["libnativewindow"],
- },
- },
test_suites: ["general-tests"],
}