diff options
author | 2023-06-01 16:13:33 +0000 | |
---|---|---|
committer | 2023-06-01 16:13:33 +0000 | |
commit | 2c88afe5b18bd97bf920c158df72346ed4aca039 (patch) | |
tree | f03a836940d69473bc542a647b3821e4ba0b3400 | |
parent | 9e1dfee912d98fa74895e4652677fac75e5eddd7 (diff) |
Remove libcutils from fluoride_defaults
Test: mma
Bug: 279502784
Change-Id: I1d34e57d351ab0f0c6baa94a6ae67eca52af705b
-rw-r--r-- | android/app/Android.bp | 1 | ||||
-rw-r--r-- | system/bta/Android.bp | 1 | ||||
-rw-r--r-- | system/btif/Android.bp | 1 | ||||
-rw-r--r-- | system/build/Android.bp | 3 | ||||
-rw-r--r-- | system/common/Android.bp | 1 | ||||
-rw-r--r-- | system/stack/Android.bp | 5 |
6 files changed, 9 insertions, 3 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp index 8dd545d28d..18911a3bb0 100644 --- a/android/app/Android.bp +++ b/android/app/Android.bp @@ -112,6 +112,7 @@ cc_library_shared { "libaaudio", "libbinder_ndk", "libcrypto", + "libcutils", "libfmq", "libhidlbase", "libnativehelper", diff --git a/system/bta/Android.bp b/system/bta/Android.bp index 47a0999c22..9e612c5255 100644 --- a/system/bta/Android.bp +++ b/system/bta/Android.bp @@ -270,6 +270,7 @@ cc_test { "android.hardware.bluetooth.audio@2.0", "android.hardware.bluetooth.audio@2.1", "libcrypto", + "libcutils", "liblog", "libprotobuf-cpp-lite", "libstatssocket", diff --git a/system/btif/Android.bp b/system/btif/Android.bp index c0ebc63d9c..113ffd0a2c 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -262,6 +262,7 @@ cc_test { "libaaudio", "libbinder_ndk", "libcrypto", + "libcutils", "libfmq", "libhidlbase", "libstatssocket", diff --git a/system/build/Android.bp b/system/build/Android.bp index afde0c5e02..548f12cee7 100644 --- a/system/build/Android.bp +++ b/system/build/Android.bp @@ -129,9 +129,6 @@ cc_defaults { "libbluetooth_gd", "libstatslog_bt", ], - shared_libs: [ - "libcutils", - ], target: { darwin: { // libstatslog_bt -> libbinder doesn't build on mac diff --git a/system/common/Android.bp b/system/common/Android.bp index f807554a65..0f46310606 100644 --- a/system/common/Android.bp +++ b/system/common/Android.bp @@ -38,6 +38,7 @@ cc_library_static { }, shared_libs: [ "libcrypto", + "libcutils", ], min_sdk_version: "Tiramisu", } diff --git a/system/stack/Android.bp b/system/stack/Android.bp index e50f936e57..2891bee0fe 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -22,6 +22,9 @@ cc_test_library { include_dirs: [ "packages/modules/Bluetooth/system", ], + shared_libs: [ + "libcutils", + ], srcs: crypto_toolbox_srcs, } @@ -1431,6 +1434,7 @@ cc_test { shared_libs: [ "libbinder_ndk", "libcrypto", + "libcutils", ], target: { android: { @@ -1512,6 +1516,7 @@ cc_test { shared_libs: [ "libbinder_ndk", "libcrypto", + "libcutils", ], target: { android: { |