diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2021-01-22 19:38:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-22 19:38:26 +0000 |
| commit | 611257f3d7d6185fe5396027dd021dde139d3b88 (patch) | |
| tree | a2422b49b931515d69c87e673d9dbc163424137c | |
| parent | 7e09193d3c354553b1207511561fa3aecf982654 (diff) | |
| parent | e5ad1620ff270796902c3fbb0103b5a822dc5607 (diff) | |
| download | bt-611257f3d7d6185fe5396027dd021dde139d3b88.tar.gz | |
Merge "Explicitly add static dependencies"
| -rw-r--r-- | build/Android.bp | 6 | ||||
| -rw-r--r-- | gd/Android.bp | 38 |
2 files changed, 43 insertions, 1 deletions
diff --git a/build/Android.bp b/build/Android.bp index 072ba109b..d19634c79 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -94,7 +94,11 @@ fluoride_defaults { fluoride_defaults { name: "fluoride_defaults", defaults: ["fluoride_defaults_fuzzable", "fluoride_types_defaults"], - shared_libs: ["libstatslog"], + shared_libs: [ + "libgrpc++", + "libgrpc_wrap", + "libstatslog" + ], sanitize: { misc_undefined: ["bounds"], }, diff --git a/gd/Android.bp b/gd/Android.bp index 63c105b46..5919ad55e 100644 --- a/gd/Android.bp +++ b/gd/Android.bp @@ -163,6 +163,8 @@ cc_defaults { "libchrome", "libcrypto", "libflatbuffers-cpp", + "libgrpc++", + "libgrpc_wrap", ], static_libs: [ "libbluetooth-protos", @@ -237,7 +239,9 @@ cc_binary { "libbacktrace", "libchrome", "libcrypto", + "libgrpc++", "libgrpc++_unsecure", + "libgrpc_wrap", "libprotobuf-cpp-full", ], target: { @@ -248,6 +252,10 @@ cc_binary { "libutils", "libcutils", ], + static_libs: [ + "libbt_common_sys_prop_cxx", + "libbt_hidl_hal_cxx", + ], }, host: { required: [ @@ -295,6 +303,10 @@ cc_test { "libutils", "libcutils", ], + static_libs: [ + "libbt_common_sys_prop_cxx", + "libbt_hidl_hal_cxx", + ], }, }, srcs: [ @@ -335,6 +347,8 @@ cc_test { shared_libs: [ "libchrome", "libcrypto", + "libgrpc++", + "libgrpc_wrap", ], sanitize: { address: true, @@ -370,6 +384,24 @@ cc_test { "libcxxbridge05", "libchrome", ], + shared_libs: [ + "libgrpc++", + "libgrpc_wrap", + ], + target: { + android: { + shared_libs: [ + "android.hardware.bluetooth@1.0", + "libhidlbase", + "libutils", + "libcutils", + ], + static_libs: [ + "libbt_common_sys_prop_cxx", + "libbt_hidl_hal_cxx", + ], + }, + }, } cc_defaults { @@ -397,6 +429,8 @@ cc_defaults { shared_libs: [ "libcrypto", "libflatbuffers-cpp", + "libgrpc++", + "libgrpc_wrap", ], cflags: [ "-DFUZZ_TARGET", @@ -409,6 +443,10 @@ cc_defaults { "libhidlbase", "libutils", ], + static_libs: [ + "libbt_common_sys_prop_cxx", + "libbt_hidl_hal_cxx", + ], }, }, } |