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

Commit 47b2d9d5 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I0492696b,I24f8df97 into main am: 29bedba8 

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



Change-Id: Ic7ab46020ebf412f43182a23b404834e00fa1449
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1fcaba6 29bedba8

android/app/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ cc_library { 


android_app {

    name: "Bluetooth",

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



    srcs: [

        ":statslog-bluetooth-java-gen",

framework/Android.bp

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

}



java_defaults {

    name: "bluetooth-module-sdk-version-defaults",

    min_sdk_version: "Tiramisu",

}



filegroup {

    name: "framework-bluetooth-sources",

    defaults: ["framework-sources-module-defaults"],
@@ -22,7 +17,6 @@ filegroup { 
// `framework-bluetooth-pre-jarjar`

java_defaults {

    name: "framework-bluetooth-defaults",

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

    static_libs: [

        "PlatformProperties",

        "bluetooth_flags_java_lib",
@@ -43,6 +37,7 @@ java_defaults { 
        ":Bluetooth-binder-aidl",

        ":framework-bluetooth-sources",

    ],

    min_sdk_version: "Tiramisu",

}



// bluetooth-service needs pre-jarjared version of framework-bluetooth so it can reference copied utility

service/Android.bp

+52 −49
Original line number Diff line number Diff line
@@ -16,27 +16,8 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

    name: "services.bluetooth-sources",

    srcs: [

        ":statslog-bluetooth-java-gen",

        "src/**/*.java",

        "src/AdapterState.kt",

        "src/AutoOnFeature.kt",

        "src/Log.kt",

        "src/RadioModeListener.kt",

        "src/airplane/ModeListener.kt",

        "src/com/**/*.kt",

        "src/satellite/ModeListener.kt",

    ],

    visibility: [":__subpackages__"],

}



// pre-jarjar version of service-bluetooth that builds against pre-jarjar version of framework-bluetooth

java_defaults {

    name: "service-bluetooth-pre-jarjar",

    srcs: [":services.bluetooth-sources"],



    name: "service-bluetooth-buildflags",

    errorprone: {

        javacflags: [

            "-Xep:AlreadyChecked:ERROR",
@@ -49,8 +30,6 @@ java_defaults { 
        ],

    },



    sdk_version: "system_server_current",



    lint: {

        error_checks: [

            "ExtraText",
@@ -68,6 +47,26 @@ java_defaults { 
        "-Werror",

    ],



    defaults_visibility: [":__subpackages__"],

}



// pre-jarjar version of service-bluetooth that builds against pre-jarjar version of framework-bluetooth

java_library {

    name: "service-bluetooth-pre-jarjar",

    defaults: ["service-bluetooth-buildflags"],

    installable: false,

    srcs: [

        ":statslog-bluetooth-java-gen",

        "src/**/*.java",

        "src/AdapterState.kt",

        "src/AutoOnFeature.kt",

        "src/Log.kt",

        "src/RadioModeListener.kt",

        "src/airplane/ModeListener.kt",

        "src/com/**/*.kt",

        "src/satellite/ModeListener.kt",

    ],



    libs: [

        "framework-annotations-lib",

        "framework-bluetooth-pre-jarjar",
@@ -88,14 +87,26 @@ java_defaults { 
        "modules-utils-shell-command-handler",

    ],



    lint: {

        baseline_filename: "lint-baseline.xml",

    },



    optimize: {

        enabled: true,

        shrink: true,

        proguard_flags_files: ["proguard.flags"],

    },



    sdk_version: "system_server_current",

    min_sdk_version: "Tiramisu",

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

    visibility: [":__subpackages__"],

}



// service-bluetooth static library

// ==============================================================

// Apply jarjaring before using library in the apex

java_library {

    name: "service-bluetooth",

    defaults: ["service-bluetooth-pre-jarjar"],

    static_libs: ["service-bluetooth-pre-jarjar"],

    installable: true,



    jarjar_rules: ":bluetooth-jarjar-rules",
@@ -105,56 +116,48 @@ java_library { 
        shrink: true,

        proguard_flags_files: ["proguard.flags"],

    },

    visibility: [

        "//packages/modules/Bluetooth/apex",

    ],

    apex_available: [

        "com.android.btservices",



    libs: [

        "framework-bluetooth",

    ],



    min_sdk_version: "Tiramisu",

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

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

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

}



java_library {

    name: "bluetooth-manager-service-proto-java-gen",

    srcs: [":srcs_bluetooth_manager_service_proto"],

    installable: false,



    proto: {

        type: "stream",

        include_dirs: [

            "external/protobuf/src",

        ],

        include_dirs: ["external/protobuf/src"],

    },

    srcs: [

        ":srcs_bluetooth_manager_service_proto",

    ],



    sdk_version: "system_server_current",

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

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

}



java_library {

    name: "bluetooth-nano-protos",

    srcs: [":system-messages-proto-src"],

    installable: false,



    proto: {

        type: "nano",

    },

    srcs: [

        ":system-messages-proto-src",

    ],



    libs: ["libprotobuf-java-nano"],

    lint: {

        strict_updatability_linting: true,



    },



    sdk_version: "system_current",

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

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

}



android_robolectric_test {

service/aidl/Android.bp

+4 −8
Original line number Diff line number Diff line
@@ -10,17 +10,13 @@ package { 
// AIDL interface used in service-bluetooth

java_library {

    name: "service-bluetooth-binder-aidl",

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

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

    srcs: [

        "android/bluetooth/IBluetoothManager.aidl",

        "android/bluetooth/IBluetoothManagerCallback.aidl",

    ],

    libs: [

        "framework-annotations-lib",

    ],

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

    sdk_version: "module_current",

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

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

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

}

service/change-ids/Android.bp

+5 −10
Original line number Diff line number Diff line
@@ -18,17 +18,12 @@ package { 


java_library {

    name: "service-bluetooth.change-ids",

    srcs: [

        "com/android/server/bluetooth/ChangeIds.java",

    ],

    libs: [

        "app-compat-annotations",

    ],

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

    srcs: ["com/android/server/bluetooth/ChangeIds.java"],

    libs: ["app-compat-annotations"],

    sdk_version: "system_server_current",

    min_sdk_version: "Tiramisu",

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

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

}



platform_compat_config {