From bfd9733a6731307c19301b040aad637463bb8c5a Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Thu, 25 Mar 2021 11:56:49 -0400 Subject: [PATCH] Use whole_static_library for cxx library deps. static_library has reverted to the old behavior of not being bundled into rlibs, however whole_static_library has been added to support that behavior. Bug: 183182230 Test: mma Change-Id: If0166b1347b005c03e9e1e1c2805513c0ec245d3 --- gd/rust/common/Android.bp | 3 +-- gd/rust/hal/Android.bp | 2 +- gd/rust/shim/Android.bp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gd/rust/common/Android.bp b/gd/rust/common/Android.bp index b0d9873de..d5b30f65d 100644 --- a/gd/rust/common/Android.bp +++ b/gd/rust/common/Android.bp @@ -26,7 +26,7 @@ rust_library { rustlibs: [ "libandroid_logger", ], - static_libs: ["libbt_common_sys_prop_cxx"], + whole_static_libs: ["libbt_common_sys_prop_cxx"], shared_libs: [ "libcutils", ], @@ -79,5 +79,4 @@ cc_library_static { shared_libs: [ "libcutils", ], - whole_static_libs: ["libcxxbridge05"], } diff --git a/gd/rust/hal/Android.bp b/gd/rust/hal/Android.bp index 7f916efc3..571a8bda0 100644 --- a/gd/rust/hal/Android.bp +++ b/gd/rust/hal/Android.bp @@ -36,7 +36,7 @@ rust_library { ], target: { android: { - static_libs: ["libbt_hidl_hal_cxx"], + whole_static_libs: ["libbt_hidl_hal_cxx"], shared_libs: [ "android.hardware.bluetooth@1.0", "android.hardware.bluetooth@1.1", diff --git a/gd/rust/shim/Android.bp b/gd/rust/shim/Android.bp index 4cd59050c..9887a6185 100644 --- a/gd/rust/shim/Android.bp +++ b/gd/rust/shim/Android.bp @@ -48,7 +48,7 @@ rust_ffi_static { proc_macros: [ "libpaste", ], - static_libs: [ + whole_static_libs: [ "libbt_callbacks_cxx", ], } -- 2.11.0