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

Commit 8a007429 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

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
parent 0e54b03c

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",

    ],

}