Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Cleanup NN utility libraries' dependencies" am: d3e413e759 am: fd0636d14b am: b3d989c805

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1950217

Change-Id: Iafd694bc5cb5ba8c781fcd1d3963e4cc3430862c
This commit is contained in:
Michael Butler
2022-01-21 00:24:13 +00:00
committed by Automerger Merge Worker
parent e90b061864 b3d989c805
commit 2dddfa7d4a
13 changed files with 20 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
neuralnetworks/1.0/utils/Android.bp
View File

@@ -31,16 +31,11 @@ cc_library_static {
export_include_dirs: ["include"],
cflags: ["-Wthread-safety"],
static_libs: [
"android.hardware.neuralnetworks@1.0",
"libarect",
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
],
shared_libs: [
"android.hardware.neuralnetworks@1.0",
],
export_static_lib_headers: [
"neuralnetworks_utils_hal_common",
],
target: {
android: {
shared_libs: ["libnativewindow"],
@@ -55,19 +50,14 @@ cc_test {
static_libs: [
"android.hardware.neuralnetworks@1.0",
"libgmock",
"libneuralnetworks_common",
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
],
shared_libs: [
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"libbase",
"libcutils",
"libfmq",
"libhidlbase",
"libhidlmemory",
"liblog",
"libutils",
],

14
neuralnetworks/1.1/utils/Android.bp
View File

@@ -31,17 +31,12 @@ cc_library_static {
export_include_dirs: ["include"],
cflags: ["-Wthread-safety"],
static_libs: [
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
"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_utils_hal_common",
],
}
cc_test {
@@ -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",
],

15
neuralnetworks/1.2/utils/Android.bp
View File

@@ -31,19 +31,14 @@ cc_library_static {
export_include_dirs: ["include"],
cflags: ["-Wthread-safety"],
static_libs: [
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
"neuralnetworks_utils_hal_1_1",
],
shared_libs: [
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
"android.hardware.neuralnetworks@1.2",
"libfmq",
],
export_static_lib_headers: [
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
"neuralnetworks_utils_hal_1_1",
],
product_variables: {
debuggable: { // eng and userdebug builds
@@ -71,7 +66,6 @@ cc_test {
"android.hardware.neuralnetworks@1.1",
"android.hardware.neuralnetworks@1.2",
"libgmock",
"libneuralnetworks_common",
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
@@ -79,13 +73,10 @@ cc_test {
"neuralnetworks_utils_hal_1_2",
],
shared_libs: [
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"libbase",
"libcutils",
"libfmq",
"libhidlbase",
"libhidlmemory",
"liblog",
"libutils",
],

17
neuralnetworks/1.3/utils/Android.bp
View File

@@ -31,21 +31,16 @@ cc_library_static {
export_include_dirs: ["include"],
cflags: ["-Wthread-safety"],
static_libs: [
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
"neuralnetworks_utils_hal_1_1",
"neuralnetworks_utils_hal_1_2",
],
shared_libs: [
"android.hardware.neuralnetworks@1.0",
"android.hardware.neuralnetworks@1.1",
"android.hardware.neuralnetworks@1.2",
"android.hardware.neuralnetworks@1.3",
"libfmq",
],
export_static_lib_headers: [
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
"neuralnetworks_utils_hal_1_1",
"neuralnetworks_utils_hal_1_2",
],
target: {
host: {
@@ -69,7 +64,6 @@ cc_test {
"android.hardware.neuralnetworks@1.2",
"android.hardware.neuralnetworks@1.3",
"libgmock",
"libneuralnetworks_common",
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
"neuralnetworks_utils_hal_1_0",
@@ -78,13 +72,10 @@ cc_test {
"neuralnetworks_utils_hal_1_3",
],
shared_libs: [
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"libbase",
"libcutils",
"libfmq",
"libhidlbase",
"libhidlmemory",
"liblog",
"libutils",
],

6
neuralnetworks/aidl/utils/Android.bp
View File

@@ -111,19 +111,13 @@ cc_test {
static_libs: [
"libaidlcommonsupport",
"libgmock",
"libneuralnetworks_common",
"neuralnetworks_types",
"neuralnetworks_utils_hal_common",
],
shared_libs: [
"android.hidl.allocator@1.0",
"libbase",
"libbinder_ndk",
"libcutils",
"libhidlbase",
"libhidlmemory",
"liblog",
"libutils",
],
target: {
android: {

1
neuralnetworks/aidl/utils/test/MockBuffer.h
View File

@@ -21,7 +21,6 @@
#include <android/binder_interface_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hidl/Status.h>
namespace aidl::android::hardware::neuralnetworks::utils {

1
neuralnetworks/aidl/utils/test/MockBurst.h
View File

@@ -21,7 +21,6 @@
#include <android/binder_interface_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hidl/Status.h>
namespace aidl::android::hardware::neuralnetworks::utils {

2
neuralnetworks/aidl/utils/test/MockExecution.h
View File

@@ -21,8 +21,6 @@
#include <android/binder_interface_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hidl/HidlSupport.h>
#include <hidl/Status.h>
namespace aidl::android::hardware::neuralnetworks::utils {

1
neuralnetworks/aidl/utils/test/MockFencedExecutionCallback.h
View File

@@ -22,7 +22,6 @@
#include <android/binder_interface_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hidl/Status.h>
namespace aidl::android::hardware::neuralnetworks::utils {

2
neuralnetworks/aidl/utils/test/MockPreparedModel.h
View File

@@ -22,8 +22,6 @@
#include <android/binder_interface_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <hidl/HidlSupport.h>
#include <hidl/Status.h>
namespace aidl::android::hardware::neuralnetworks::utils {

13
neuralnetworks/utils/adapter/hidl/Android.bp
View File

@@ -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",
],
}

8
neuralnetworks/utils/common/Android.bp
View File

@@ -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: {

10
neuralnetworks/utils/service/Android.bp
View File

@@ -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",
],
}