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

Commit abe5606a authored by Ivan Lozano's avatar Ivan Lozano Committed by Automerger Merge Worker
Browse files

Merge "Use whole_static_library for cxx library deps." am: 71208d13 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1654111

Change-Id: I46e9d811ca25cefc855e6f7c7daef004c2bbc545
parents 9d7a5e1b 71208d13

system/gd/rust/common/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -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"],

}

system/gd/rust/hal/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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",

system/gd/rust/shim/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ rust_ffi_static { 
    proc_macros: [

        "libpaste",

    ],

    static_libs: [

    whole_static_libs: [

        "libbt_callbacks_cxx",

    ],

}