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

Commit b31b9d11 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Make java_sdk_library dependencies explicit" into main am: c8ae0e96 

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



Change-Id: I5344e9c84ad311bf3b5b62a71e9f37e12ccde3a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4179cb5f c8ae0e96

android/app/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -246,16 +246,16 @@ android_app { 
        "error_prone_annotations",

        "framework-annotations-lib",

        "framework-bluetooth-pre-jarjar",

        "framework-configinfrastructure",

        "framework-configinfrastructure.stubs.module_lib",

        "framework-connectivity.stubs.module_lib",

        "framework-location.stubs.module_lib",

        "framework-mediaprovider",

        "framework-mediaprovider.stubs.module_lib",

        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "unsupportedappusage",



        // Need to link the class at runtime

        "framework-bluetooth",

        "framework-bluetooth.stubs.module_lib",

    ],

    static_libs: [

        "BluetoothApiShims",

android/app/tests/unit/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ java_defaults { 
    min_sdk_version: "Tiramisu",

    target_sdk_version: "current",

    libs: [

        "android.test.base",

        "android.test.mock",

        "android.test.runner",

        "javax.obex",

        "android.test.base.stubs",

        "android.test.mock.stubs",

        "android.test.runner.stubs",

        "javax.obex.stubs",

        "libprotobuf-java-micro",

        "telephony-common",

    ],

flags/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ java_aconfig_library { 
    apex_available: [

        "com.android.btservices",

    ],

    libs: ["framework-configinfrastructure"],

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

    sdk_version: "module_current",

    min_sdk_version: "Tiramisu",

}

framework/tests/bumble/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ android_test_helper_app { 
    min_sdk_version: "current",

    target_sdk_version: "current",

    libs: [

        "android.test.base",

        "android.test.base.stubs",

        "libprotobuf-java-micro",

    ],

framework/tests/unit/Android.bp

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

    },

    libs: [

        "android.test.base",

        "android.test.runner",

        "android.test.base.stubs",

        "android.test.runner.stubs",

    ],

    static_libs: [

        "androidx.test.ext.truth",