diff options
| author | 2025-01-09 10:56:45 -0800 | |
|---|---|---|
| committer | 2025-01-09 10:56:45 -0800 | |
| commit | f790379399f14d5dceaba3c3278f71c1f0182347 (patch) | |
| tree | 7c43f3a18953e136c3d5f4003431ced32a1c0dca /service | |
| parent | 821018bbe35599b1b73c7dd187abec144f58ed9e (diff) | |
| parent | bb7ed75d922c3b8e68e182ef3f06d6c8c7d53f67 (diff) | |
Merge changes from topic "activate_com.android.bt-module_in_system_image" into main
* changes:
Disable obsolete and deprecated btservices
[bt] Add the Google module in pixel image
Diffstat (limited to 'service')
| -rw-r--r-- | service/Android.bp | 25 | ||||
| -rw-r--r-- | service/tests/AndroidTest.xml | 7 |
2 files changed, 3 insertions, 29 deletions
diff --git a/service/Android.bp b/service/Android.bp index 8cb304be07..57968f07b7 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -93,7 +93,6 @@ java_library { } // Apply jarjaring before using library in the apex -// TODO b/383863941 delete and merge with service-bluetooth-new java_library { name: "service-bluetooth", static_libs: ["service-bluetooth-pre-jarjar"], @@ -113,30 +112,6 @@ java_library { sdk_version: "system_server_current", min_sdk_version: "Tiramisu", - apex_available: ["com.android.btservices"], - visibility: ["//packages/modules/Bluetooth/apex"], -} - -// Apply jarjaring before using library in the apex -java_library { - name: "service-bluetooth-new", - static_libs: ["service-bluetooth-pre-jarjar"], - installable: true, - - jarjar_rules: ":bluetooth-jarjar-rules", - - optimize: { - enabled: true, - shrink: true, - proguard_flags_files: ["proguard.flags"], - }, - - libs: [ - "framework-bluetooth.impl", - ], - - sdk_version: "system_server_current", - min_sdk_version: "Tiramisu", apex_available: ["com.android.bt"], visibility: ["//packages/modules/Bluetooth/apex"], } diff --git a/service/tests/AndroidTest.xml b/service/tests/AndroidTest.xml index 4e1be42419..c759326927 100644 --- a/service/tests/AndroidTest.xml +++ b/service/tests/AndroidTest.xml @@ -28,8 +28,7 @@ <option name="test-suite-tag" value="apct" /> <option name="test-tag" value="ServiceBluetoothTests" /> - <option name="config-descriptor:metadata" key="mainline-param" - value="com.google.android.btservices.apex" /> + <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.bt.apex" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.server.bluetooth.test" /> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> @@ -39,7 +38,7 @@ <!-- Only run FrameworkBluetoothTests in MTS if the Bluetooth Mainline module is installed. --> <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> - <option name="mainline-module-package-name" value="com.android.btservices" /> - <option name="mainline-module-package-name" value="com.google.android.btservices" /> + <option name="mainline-module-package-name" value="com.android.bt" /> + <option name="mainline-module-package-name" value="com.google.android.bt" /> </object> </configuration> |