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

Commit 05e58b30 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "Don't leak internal flag to CTS" into main am: 542b3fc6 

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



Change-Id: Iedf20c61c36e41966cd3d31615ed7740f7ae7511
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f791c59d 542b3fc6

flags/Android.bp

+9 −25
Original line number Diff line number Diff line
@@ -7,9 +7,7 @@ aconfig_declarations { 
    name: "bluetooth_aconfig_flags",

    package: "com.android.bluetooth.flags",

    container: "com.android.btservices",

    visibility: [

        "//packages/modules/Bluetooth/framework",

    ],

    visibility: ["//packages/modules/Bluetooth/framework"],

    // LINT.IfChange

    srcs: [

        "a2dp.aconfig",
@@ -63,13 +61,8 @@ aconfig_declarations { 
java_aconfig_library {

    name: "bluetooth_flags_java_lib",

    aconfig_declarations: "bluetooth_aconfig_flags",

    visibility: [

        "//cts/tests/tests/bluetooth:__subpackages__",

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

    ],

    apex_available: [

        "com.android.btservices",

    ],

    visibility: ["//packages/modules/Bluetooth:__subpackages__"],

    apex_available: ["com.android.btservices"],

    libs: ["framework-configinfrastructure.stubs.module_lib"],

    sdk_version: "module_current",

    min_sdk_version: "Tiramisu",
@@ -82,6 +75,7 @@ java_aconfig_library { 
    min_sdk_version: "VanillaIceCream",

    mode: "exported",

    visibility: [

        "//cts/tests/tests/bluetooth:__subpackages__",

        "//frameworks/base",

        "//frameworks/base/packages/SettingsLib",

    ],
@@ -91,12 +85,8 @@ cc_aconfig_library { 
    name: "bluetooth_flags_c_lib",

    aconfig_declarations: "bluetooth_aconfig_flags",

    host_supported: true,

    visibility: [

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

    ],

    apex_available: [

        "com.android.btservices",

    ],

    visibility: ["//packages/modules/Bluetooth:__subpackages__"],

    apex_available: ["com.android.btservices"],

    min_sdk_version: "Tiramisu",

}
@@ -105,9 +95,7 @@ cc_aconfig_library { 
    aconfig_declarations: "bluetooth_aconfig_flags",

    mode: "test",

    host_supported: true,

    visibility: [

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

    ],

    visibility: ["//packages/modules/Bluetooth/system:__subpackages__"],

    min_sdk_version: "Tiramisu",

}
@@ -116,11 +104,7 @@ rust_aconfig_library { 
    host_supported: true,

    crate_name: "bluetooth_aconfig_flags_rust",

    aconfig_declarations: "bluetooth_aconfig_flags",

    apex_available: [

        "com.android.btservices",

    ],

    apex_available: ["com.android.btservices"],

    min_sdk_version: "Tiramisu",

    visibility: [

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

    ],

    visibility: ["//packages/modules/Bluetooth/system:__subpackages__"],

}