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

Commit ab65283b authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "[PANDORA_DEV] Allow Bluetooth hidden from Pandora" into stage-aosp-master am: 721784cf 

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



Change-Id: If290d4a2c36581a02cd7e6c122aa97bf27bb7e11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fda4fd75 721784cf

android/pandora/server/Android.bp

+21 −5
Original line number Diff line number Diff line
@@ -2,11 +2,20 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_test_helper_app {

    name: "PandoraServer",

java_library_static {

    name: "PandoraServerLib",



    srcs: ["src/**/*.kt"],



    platform_apis: true,

    certificate: "platform",



    sdk_version: "core_platform",



    libs: [

        // Access to hidden apis in Bluetooth:

        "framework-bluetooth.impl",

        "framework",

    ],



    static_libs: [

        "androidx.test.runner",
@@ -20,6 +29,15 @@ android_test_helper_app { 
        "pandora-proto-java",

        "opencensus-java-contrib-grpc-metrics",

    ],

}



android_test_helper_app {

    name: "PandoraServer",

    certificate: "platform",



    static_libs: [

        "PandoraServerLib",

    ],



    dex_preopt: {

        enabled: false,
@@ -27,8 +45,6 @@ android_test_helper_app { 
    optimize: {

        enabled: false,

    },



    test_suites: ["device-tests"],

}



android_test {

framework/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ java_sdk_library { 
        "//external/sl4a/Common",

        "//frameworks/opt/wear",

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

        "//packages/modules/Bluetooth/android/pandora/server",

        "//packages/modules/Bluetooth/service",

        "//packages/modules/Connectivity/nearby/tests/multidevices/clients/test_support/fastpair_provider",

        "//packages/services/Car/car-builtin-lib",