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

Commit 7f278990 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I97ca96d5,Ie3d023b3,Ief254d37,I83b23ce1 am: b671abf7 am: f537e5db am: 2442d8d3 

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



Change-Id: I3340b9d6129b23ad44198f2f2d9a0c6766bfd412
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbff085b 2442d8d3

android/pandora/server/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -10,8 +10,11 @@ java_library_static { 
    sdk_version: "core_platform",



    libs: [

        // order matters: classes in framework-bluetooth are resolved before framework, meaning

        // @hide APIs in framework-bluetooth are resolved before @SystemApi stubs in framework

        // Access to hidden apis in Bluetooth:

        "framework-bluetooth.impl",



        "framework",

    ],

apex/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ apex { 
    systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],

    compat_configs: [

        "bluetooth-compat-config",

        "framework-bluetooth-compat-config",

        "bluetoothapk-platform-compat-config",

        "framework-bluetooth-compat-config",

    ],

    apps: ["Bluetooth"],
@@ -41,9 +41,9 @@ apex { 
        "audio_set_configurations_json",

        "audio_set_scenarios_bfbs",

        "audio_set_scenarios_json",

        "btservices-linker-config",

        "bt_did.conf",

        "bt_stack.conf",

        "btservices-linker-config",

        "interop_database.conf",

        "privapp_allowlist_com.android.bluetooth.xml",

    ],

framework/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ filegroup { 
    name: "framework-bluetooth-sources",

    defaults: ["framework-sources-module-defaults"],

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

        "java/**/*.java",

    ],

    path: "java",

}
@@ -24,13 +24,13 @@ java_defaults { 
    name: "framework-bluetooth-defaults",

    defaults: ["bluetooth-module-sdk-version-defaults"],

    static_libs: [

        "modules-utils-synchronous-result-receiver",

        "PlatformProperties",

        "modules-utils-synchronous-result-receiver",

    ],

    libs: [

        "app-compat-annotations",

        "framework-tethering.stubs.module_lib",

        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage

        "app-compat-annotations",

    ],

    stub_only_libs: ["framework-tethering.stubs.module_lib"],

    srcs: [
@@ -53,8 +53,8 @@ java_library { 
java_sdk_library {

    name: "framework-bluetooth",

    defaults: [

        "framework-module-defaults",

        "framework-bluetooth-defaults",

        "framework-module-defaults",

    ],



    jarjar_rules: ":bluetooth-jarjar-rules",
@@ -96,14 +96,14 @@ java_defaults { 
    name: "framework-bluetooth-tests-defaults",

    sdk_version: "core_platform",

    libs: [

        "app-compat-annotations",

        // order matters: classes in framework-bluetooth are resolved before framework, meaning

        // @hide APIs in framework-bluetooth are resolved before @SystemApi stubs in framework

        "framework-bluetooth.impl",

        "framework",



        "framework",

        // if sdk_version="" this gets automatically included, but here we need to add manually.

        "framework-res",

        "app-compat-annotations",

    ],

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

}

framework/tests/stress/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ android_test { 
        exclude_filter: [],

    },

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.runner",

    ],

    static_libs: [

        "androidx.test.rules",

framework/tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ android_test { 
        exclude_filter: [],

    },

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.runner",

    ],

    static_libs: [

        "androidx.test.ext.truth",