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

Commit ff68f67e authored by William Escande's avatar William Escande
Browse files

Build files: remove barely used default 

It make no sens to have a default that define our min version, this
should be updated only when removing support for older android

Bug: 311772251
Test: m .
Flag: Exempt, build change
Change-Id: I24f8df976eddc942cf31eb71524071fb27b0a841
parent a7340e73

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/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 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",
@@ -23,4 +22,5 @@ java_library { 
    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

}