summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
author William Escande <wescande@google.com> 2025-01-09 12:22:00 -0800
committer William Escande <wescande@google.com> 2025-01-09 12:30:29 -0800
commit6b3bed846fb38036e23e70b18c07be2fa1c0aaaf (patch)
tree9bd7542e3b24068580f37098faf78904ff54d111 /service
parentf790379399f14d5dceaba3c3278f71c1f0182347 (diff)
Modify apex_available to Bluetooth apex
Bluetooth apex name has changed from com.android.btservices to com.android.bt. We now need to update the reference in the code. for i in `fd Android.bp` do perl -i -0pe "s/(apex_available: \[[^\]]*\")com.android.btservices(\"[^\]]*])/\1com.android.bt\2/g" $i # to replace btservices by bt perl -i -0pe "s/apex_available: \[\n *\"com.android.bt\",\n *\],/apex_available: [\"com.android.bt\"],/g" $i # to reduce the 3 lines into 1 when bt is the only apex available done Bug: 383863941 Flag: Exempt build infra Test: m . Change-Id: Ib9a8e1f5d4b31edbfd66273b09e45329a0122508
Diffstat (limited to 'service')
-rw-r--r--service/Android.bp6
-rw-r--r--service/aidl/Android.bp2
-rw-r--r--service/change-ids/Android.bp2
3 files changed, 5 insertions, 5 deletions
diff --git a/service/Android.bp b/service/Android.bp
index 57968f07b7..63fd7b8faa 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -88,7 +88,7 @@ java_library {
sdk_version: "system_server_current",
min_sdk_version: "Tiramisu",
- apex_available: ["com.android.btservices"],
+ apex_available: ["com.android.bt"],
visibility: [":__subpackages__"],
}
@@ -128,7 +128,7 @@ java_library {
sdk_version: "system_server_current",
min_sdk_version: "Tiramisu",
- apex_available: ["com.android.btservices"],
+ apex_available: ["com.android.bt"],
}
java_library {
@@ -147,7 +147,7 @@ java_library {
sdk_version: "system_current",
min_sdk_version: "Tiramisu",
- apex_available: ["com.android.btservices"],
+ apex_available: ["com.android.bt"],
}
android_robolectric_test {
diff --git a/service/aidl/Android.bp b/service/aidl/Android.bp
index d7adba534e..14980c7520 100644
--- a/service/aidl/Android.bp
+++ b/service/aidl/Android.bp
@@ -17,6 +17,6 @@ java_library {
libs: ["framework-annotations-lib"],
sdk_version: "module_current",
min_sdk_version: "Tiramisu",
- apex_available: ["com.android.btservices"],
+ apex_available: ["com.android.bt"],
visibility: ["//packages/modules/Bluetooth:__subpackages__"],
}
diff --git a/service/change-ids/Android.bp b/service/change-ids/Android.bp
index 3544d6b1e2..b717d09e36 100644
--- a/service/change-ids/Android.bp
+++ b/service/change-ids/Android.bp
@@ -22,7 +22,7 @@ java_library {
libs: ["app-compat-annotations"],
sdk_version: "system_server_current",
min_sdk_version: "Tiramisu",
- apex_available: ["com.android.btservices"],
+ apex_available: ["com.android.bt"],
visibility: ["//packages/modules/Bluetooth/service:__subpackages__"],
}