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

Commit 0df1a099 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove libchrome_support_defaults" am: 7e18bc13 

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



Change-Id: I843c020d4cd250faa119fef97588be7114945c78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40b54c56 7e18bc13

system/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ genrule { 
// Export system headers for rules that can't simply use `include_dirs`

cc_library_headers {

    name: "libbluetooth_system_headers",

    defaults: ["libchrome_support_defaults"],

    visibility: [

        "//packages/modules/Bluetooth/system:__subpackages__",

    ],

system/btcore/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ cc_library_static { 


cc_library_headers {

    name: "libbtcore_headers",

    defaults: ["libchrome_support_defaults"],

    export_include_dirs: ["./"],

    vendor_available: true,

    host_supported: true,

system/build/Android.bp

+0 −24
Original line number Diff line number Diff line
@@ -23,30 +23,6 @@ cc_defaults { 
    ],

}



cc_defaults {

    name: "libchrome_support_defaults",

    defaults: ["fluoride_common_options"],

    static_libs: [

        "libchrome",

        "libevent",

        "libmodpb64",

    ],

    shared_libs: [

        "libbase",

    ],

    target: {

        darwin: {

            enabled: false,

        },

        android: {

            shared_libs: [

                "libcutils",

                "liblog",

            ],

        },

    },

}



// Fuzzable defaults are the subset of defaults that are used in fuzzing, which

// requires no shared libraries, and no explicit sanitization.

cc_defaults {

system/gd/Android.bp

+6 −5
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ cc_defaults { 
    name: "libbluetooth_gd_defaults",

    defaults: [

        "gd_defaults",

        "libchrome_support_defaults",

    ],

    host_supported: true,

    target: {
@@ -194,6 +193,7 @@ cc_library { 
        "com.android.btservices",

    ],

    min_sdk_version: "31",

    static_libs: ["libchrome"],

}



cc_library {
@@ -208,6 +208,7 @@ cc_library { 
        "-DFUZZ_TARGET",

        "-DUSE_FAKE_TIMERS",

    ],

    static_libs: ["libchrome"],

}



cc_library {
@@ -221,13 +222,13 @@ cc_library { 
    cflags: [

        "-DUSE_FAKE_TIMERS",

    ],

    static_libs: ["libchrome"],

}



cc_binary {

    name: "bluetooth_stack_with_facade",

    defaults: [

        "gd_defaults",

        "libchrome_support_defaults",

    ],

    host_supported: true,

    srcs: [
@@ -263,6 +264,7 @@ cc_binary { 
        "libbluetooth_rust_interop",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libflatbuffers-cpp",

    ],

    shared_libs: [
@@ -307,7 +309,6 @@ cc_test { 
    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "gd_defaults",

        "libchrome_support_defaults",

        "mts_defaults",

    ],

    host_supported: true,
@@ -385,6 +386,7 @@ cc_test { 
        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libc++fs",

        "libchrome",

        "libflatbuffers-cpp",

        "libgmock",

    ],
@@ -403,7 +405,6 @@ cc_test { 
    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "gd_defaults",

        "libchrome_support_defaults",

        "mts_defaults",

    ],

    include_dirs: ["packages/modules/Bluetooth/system/gd"],
@@ -534,7 +535,6 @@ cc_benchmark { 
    name: "bluetooth_benchmark_gd",

    defaults: [

        "gd_defaults",

        "libchrome_support_defaults",

    ],

    host_supported: true,

    srcs: [
@@ -544,6 +544,7 @@ cc_benchmark { 
    static_libs: [

        "libbluetooth_gd",

        "libbt_shim_bridge",

        "libchrome",

    ],

}

system/gd/rust/shim/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ cc_library_static { 
    name: "libbt_shim_bridge",

    defaults: [

        "gd_ffi_defaults",

        "libchrome_support_defaults",

    ],

    generated_headers: [

        "cxx-bridge-header",
@@ -97,7 +96,6 @@ cc_library_static { 
    name: "libbluetooth_rust_interop",

    defaults: [

        "gd_ffi_defaults",

        "libchrome_support_defaults",

    ],

    static_libs: [

        "libbt_shim_bridge",