diff options
Diffstat (limited to 'system/gd/rust/shim/Android.bp')
| -rw-r--r-- | system/gd/rust/shim/Android.bp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/system/gd/rust/shim/Android.bp b/system/gd/rust/shim/Android.bp index 6df6a31c05..7521f45792 100644 --- a/system/gd/rust/shim/Android.bp +++ b/system/gd/rust/shim/Android.bp @@ -46,7 +46,7 @@ rust_defaults { proc_macros: [ "libpaste", ], - whole_static_libs: [ + static_libs: [ "libbt_callbacks_cxx", ], } @@ -60,7 +60,6 @@ rust_ffi_static { name: "libbt_shim_ffi", defaults: ["libbt_shim_defaults"], apex_available: [ - "//apex_available:platform", "com.android.bluetooth", ], min_sdk_version: "30", @@ -68,7 +67,10 @@ rust_ffi_static { cc_library_static { name: "libbt_shim_bridge", - defaults: ["gd_ffi_defaults"], + defaults: [ + "gd_ffi_defaults", + "libchrome_support_defaults" + ], generated_headers: [ "libbt_init_flags_bridge_header", "libbt_shim_bridge_header", @@ -96,25 +98,23 @@ cc_library_static { ], host_supported: true, apex_available: [ - "//apex_available:platform", "com.android.bluetooth", ], - shared_libs: [ - "libchrome", - ], min_sdk_version: "30", } cc_library_static { name: "libbluetooth_rust_interop", - defaults: ["gd_ffi_defaults"], - whole_static_libs: [ + defaults: [ + "gd_ffi_defaults", + "libchrome_support_defaults" + ], + static_libs: [ "libbt_shim_bridge", "libbt_shim_ffi", ], host_supported: true, apex_available: [ - "//apex_available:platform", "com.android.bluetooth", ], min_sdk_version: "30", @@ -122,16 +122,15 @@ cc_library_static { cc_library_static { name: "libbt_callbacks_cxx", - defaults: ["gd_ffi_defaults"], + defaults: [ + "gd_ffi_defaults", + "libchrome_support_defaults" + ], header_libs: ["libbt_callbacks_cxx_headers"], srcs: ["callbacks/callbacks.cc"], generated_headers: ["libbt_shim_bridge_header", "cxx-bridge-header"], - shared_libs: [ - "libchrome", - ], host_supported: true, apex_available: [ - "//apex_available:platform", "com.android.bluetooth", ], min_sdk_version: "30", @@ -142,7 +141,6 @@ cc_library_headers { local_include_dirs: ["callbacks"], host_supported: true, apex_available: [ - "//apex_available:platform", "com.android.bluetooth", ], min_sdk_version: "30", |