summaryrefslogtreecommitdiff
path: root/neuralnetworks/1.1
diff options
context:
space:
mode:
authorMichael Butler <butlermichael@google.com>2022-01-21 00:24:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-21 00:24:13 +0000
commit2dddfa7d4a5d24aac0e76f78ed80bc901b6648a0 (patch)
tree932bdcb1715e54a3361e4488ffe81a5195fce0ac /neuralnetworks/1.1
parente90b061864e37d7106b1a5091e2a5f728501d03f (diff)
parentb3d989c8057617a063269d666c0f47ffb49e01a3 (diff)
Merge "Cleanup NN utility libraries' dependencies" am: d3e413e759 am: fd0636d14b am: b3d989c805
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1950217 Change-Id: Iafd694bc5cb5ba8c781fcd1d3963e4cc3430862c
Diffstat (limited to 'neuralnetworks/1.1')
-rw-r--r--neuralnetworks/1.1/utils/Android.bp14
1 files changed, 2 insertions, 12 deletions
diff --git a/neuralnetworks/1.1/utils/Android.bp b/neuralnetworks/1.1/utils/Android.bp
index 737ff58159..4b8999f559 100644
--- a/neuralnetworks/1.1/utils/Android.bp
+++ b/neuralnetworks/1.1/utils/Android.bp
@@ -31,16 +31,11 @@ cc_library_static {
export_include_dirs: ["include"],
cflags: ["-Wthread-safety"],
static_libs: [
- "neuralnetworks_types",
- "neuralnetworks_utils_hal_common",
- "neuralnetworks_utils_hal_1_0",
- ],
- shared_libs: [
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
- ],
- export_static_lib_headers: [
+ "neuralnetworks_types",
"neuralnetworks_utils_hal_common",
+ "neuralnetworks_utils_hal_1_0",
],
}
@@ -52,20 +47,15 @@ cc_test {
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
"libgmock",
- "libneuralnetworks_common",
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
"neuralnetworks_utils_hal_1_1",
],
shared_libs: [
- "android.hidl.allocator@1.0",
- "android.hidl.memory@1.0",
"libbase",
"libcutils",
- "libfmq",
"libhidlbase",
- "libhidlmemory",
"liblog",
"libutils",
],