Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4af3c1e authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Set rust_static_cc_lib_defaults" am: 75b02e73 am: eab186d2 am:... 

Merge "Set rust_static_cc_lib_defaults" am: 75b02e73 am: eab186d2 am: 0e11489a am: 924fed7b am: f11aac5d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2169848



Change-Id: I5060b5a57e72c325204fbcc3307446de973098b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3754d0af f11aac5d

system/gd/rust/common/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ cc_library_static { 


cc_library_static {

    name: "libbt_keystore_cc",

    defaults: ["gd_ffi_defaults"],

    defaults: ["rust_static_cc_lib_defaults", "gd_ffi_defaults"],

    header_libs: ["libbt_keystore_cc_headers"],

    srcs: ["keystore/fake_bt_keystore.cc"],

    generated_headers: ["libbt_common_bridge_header", "cxx-bridge-header"],

system/gd/rust/stack/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ genrule { 


cc_library_static {

    name: "libbt_hidl_hal_cxx",

    defaults: ["gd_ffi_defaults"],

    defaults: ["rust_static_cc_lib_defaults", "gd_ffi_defaults"],

    srcs: ["src/hal/ffi/hidl.cc"],

    local_include_dirs: ["src/hal/ffi"],

    include_dirs: ["packages/modules/Bluetooth/system"],