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

Commit 9c3f013b authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Jarjar the flag in bluetooth modules" into main am: 9ddea091 am: 9e1dfdd3 

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



Change-Id: I7ae018b97d9c3a479d399d306459921340543e93
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d2026cb 9e1dfdd3

android/app/tests/unit/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ java_defaults { 
        "truth",

    ],



    jarjar_rules: ":bluetooth-jarjar-rules",

    asset_dirs: ["src/com/android/bluetooth/btservice/storage/schemas"],



    // Include all test java files.

flags/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -63,11 +63,7 @@ java_aconfig_library { 
    aconfig_declarations: "bluetooth_aconfig_flags",

    visibility: [

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

        "//packages/modules/Bluetooth/android/app",

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

        "//packages/modules/Bluetooth/framework/tests/bumble",

        "//packages/modules/Bluetooth/framework/tests/util",

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

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

    ],

    apex_available: [

        "com.android.btservices",

framework/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ filegroup { 
        "java/**/*.java",

    ],

    path: "java",

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

}



// defaults shared between `framework-bluetooth` & `framework-bluetooth-pre-jarjar`
@@ -49,6 +50,7 @@ java_library { 
    sdk_version: "module_current",

    libs: ["framework-annotations-lib"],

    installable: false,

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

}



// post-jarjar version of framework-bluetooth
@@ -85,7 +87,6 @@ java_sdk_library { 


    permitted_packages: [

        "android.bluetooth",

        "com.android.bluetooth.flags",

        "com.android.bluetooth.jarjar",

    ],

    plugins: [
@@ -149,7 +150,7 @@ java_defaults { 
        // if sdk_version="" this gets automatically included, but here we need to add manually.

        "framework-res",

    ],

    defaults_visibility: ["//visibility:public"],

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

}



filegroup {

framework/jarjar-rules.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ rule android.hardware.radio.V1_0.** com.android.bluetooth.jarjar.@0 
rule com.google.android.mms.** com.android.bluetooth.jarjar.@0

rule com.android.internal.util.** com.android.bluetooth.jarjar.@0

rule com.android.modules.expresslog.** com.android.bluetooth.jarjar.@0

rule com.android.bluetooth.flags.** com.android.bluetooth.jarjar.@0

framework/tests/unit/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ package { 
android_test {

    name: "FrameworkBluetoothTests",



    defaults: ["framework-bluetooth-tests-defaults"],



    sdk_version: "module_current",

    min_sdk_version: "Tiramisu",

    target_sdk_version: "current",
@@ -19,11 +18,14 @@ android_test { 
    libs: [

        "android.test.base.stubs",

        "android.test.runner.stubs",

        "framework-annotations-lib",

        "framework-bluetooth.impl",

    ],

    static_libs: [

        "androidx.test.ext.truth",

        "androidx.test.rules",

        "flag-junit",

        "framework-bluetooth-pre-jarjar",

        "frameworks-base-testutils",

        "junit",

        "mockito-target",