summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/product/base_system.mk2
-rw-r--r--target/product/default_art_config.mk4
-rw-r--r--tools/aconfig/aconfig_device_paths/mainline_aconfig_flags_paths.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b3b58d35f0..90d45a8c3b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -52,7 +52,7 @@ PRODUCT_PACKAGES += \
com.android.adbd \
com.android.adservices \
com.android.appsearch \
- com.android.btservices \
+ com.android.bt \
com.android.configinfrastructure \
com.android.conscrypt \
com.android.devicelock \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index d857e04b69..e543ccf035 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -65,7 +65,7 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.adservices:framework-adservices \
com.android.adservices:framework-sdksandbox \
com.android.appsearch:framework-appsearch \
- com.android.btservices:framework-bluetooth \
+ com.android.bt:framework-bluetooth \
com.android.configinfrastructure:framework-configinfrastructure \
com.android.conscrypt:conscrypt \
com.android.devicelock:framework-devicelock \
@@ -171,7 +171,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
# Keep the list sorted by module names and then library names.
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
- com.android.btservices:service-bluetooth \
+ com.android.bt:service-bluetooth \
com.android.devicelock:service-devicelock \
com.android.os.statsd:service-statsd \
com.android.scheduling:service-scheduling \
diff --git a/tools/aconfig/aconfig_device_paths/mainline_aconfig_flags_paths.txt b/tools/aconfig/aconfig_device_paths/mainline_aconfig_flags_paths.txt
index af73a842b9..aad2b23896 100644
--- a/tools/aconfig/aconfig_device_paths/mainline_aconfig_flags_paths.txt
+++ b/tools/aconfig/aconfig_device_paths/mainline_aconfig_flags_paths.txt
@@ -1,7 +1,7 @@
"/apex/com.android.adservices/etc/aconfig_flags.pb",
"/apex/com.android.appsearch/etc/aconfig_flags.pb",
"/apex/com.android.art/etc/aconfig_flags.pb",
-"/apex/com.android.btservices/etc/aconfig_flags.pb",
+"/apex/com.android.bt/etc/aconfig_flags.pb",
"/apex/com.android.cellbroadcast/etc/aconfig_flags.pb",
"/apex/com.android.configinfrastructure/etc/aconfig_flags.pb",
"/apex/com.android.conscrypt/etc/aconfig_flags.pb",