diff options
| author | Michael Butler <butlermichael@google.com> | 2022-01-21 00:24:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-21 00:24:13 +0000 |
| commit | 2dddfa7d4a5d24aac0e76f78ed80bc901b6648a0 (patch) | |
| tree | 932bdcb1715e54a3361e4488ffe81a5195fce0ac /neuralnetworks/utils | |
| parent | e90b061864e37d7106b1a5091e2a5f728501d03f (diff) | |
| parent | b3d989c8057617a063269d666c0f47ffb49e01a3 (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/utils')
| -rw-r--r-- | neuralnetworks/utils/adapter/hidl/Android.bp | 13 | ||||
| -rw-r--r-- | neuralnetworks/utils/common/Android.bp | 8 | ||||
| -rw-r--r-- | neuralnetworks/utils/service/Android.bp | 10 |
3 files changed, 10 insertions, 21 deletions
diff --git a/neuralnetworks/utils/adapter/hidl/Android.bp b/neuralnetworks/utils/adapter/hidl/Android.bp index d073106a5f..6875daa4ed 100644 --- a/neuralnetworks/utils/adapter/hidl/Android.bp +++ b/neuralnetworks/utils/adapter/hidl/Android.bp @@ -30,17 +30,16 @@ cc_library_static { local_include_dirs: ["include/nnapi/hal"], export_include_dirs: ["include"], static_libs: [ - "neuralnetworks_types", - "neuralnetworks_utils_hal_1_0", - "neuralnetworks_utils_hal_1_1", - "neuralnetworks_utils_hal_1_2", - "neuralnetworks_utils_hal_1_3", - ], - shared_libs: [ "android.hardware.neuralnetworks@1.0", "android.hardware.neuralnetworks@1.1", "android.hardware.neuralnetworks@1.2", "android.hardware.neuralnetworks@1.3", "libfmq", + "neuralnetworks_types", + "neuralnetworks_utils_hal_1_0", + "neuralnetworks_utils_hal_1_1", + "neuralnetworks_utils_hal_1_2", + "neuralnetworks_utils_hal_1_3", + "neuralnetworks_utils_hal_common", ], } diff --git a/neuralnetworks/utils/common/Android.bp b/neuralnetworks/utils/common/Android.bp index 39927a363c..bfba24fc1f 100644 --- a/neuralnetworks/utils/common/Android.bp +++ b/neuralnetworks/utils/common/Android.bp @@ -39,20 +39,12 @@ cc_test { srcs: ["test/*.cpp"], static_libs: [ "libgmock", - "libneuralnetworks_common", "neuralnetworks_types", "neuralnetworks_utils_hal_common", ], shared_libs: [ - "android.hidl.allocator@1.0", - "android.hidl.memory@1.0", "libbase", "libcutils", - "libfmq", - "libhidlbase", - "libhidlmemory", - "liblog", - "libutils", ], target: { android: { diff --git a/neuralnetworks/utils/service/Android.bp b/neuralnetworks/utils/service/Android.bp index c3272ae430..452078b7d4 100644 --- a/neuralnetworks/utils/service/Android.bp +++ b/neuralnetworks/utils/service/Android.bp @@ -33,6 +33,10 @@ cc_library_static { local_include_dirs: ["include/nnapi/hal"], export_include_dirs: ["include"], static_libs: [ + "android.hardware.neuralnetworks@1.0", + "android.hardware.neuralnetworks@1.1", + "android.hardware.neuralnetworks@1.2", + "android.hardware.neuralnetworks@1.3", "neuralnetworks_types", "neuralnetworks_utils_hal_1_0", "neuralnetworks_utils_hal_1_1", @@ -40,10 +44,4 @@ cc_library_static { "neuralnetworks_utils_hal_1_3", "neuralnetworks_utils_hal_common", ], - shared_libs: [ - "android.hardware.neuralnetworks@1.0", - "android.hardware.neuralnetworks@1.1", - "android.hardware.neuralnetworks@1.2", - "android.hardware.neuralnetworks@1.3", - ], } |