Make change and version bump to aml_sta_330910000 for mainline module file: None
Change-Id: I48cf62a709b133bc86ce21c29b768dfeccbe61bd
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 259035e..483beaf 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -80,7 +80,8 @@
wifi \
$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
- $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE)))
+ $(if $(call soong_config_get,$(m)_module,source_build),,\
+ $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE))))
# Apex build mode variables
ifdef APEX_BUILD_FOR_PRE_S_DEVICES
diff --git a/core/build_id.mk b/core/build_id.mk
index 5b50f27..886fd86 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=330710000
+BUILD_ID=330910000
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6f6cd79..c919ac4 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -52,7 +52,7 @@
com.android.adbd \
com.android.adservices \
com.android.appsearch \
- com.android.bluetooth \
+ com.android.btservices \
com.android.conscrypt \
com.android.extservices \
com.android.i18n \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 993edf3..e2bb9d5 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -54,7 +54,7 @@
com.android.adservices:framework-adservices \
com.android.adservices:framework-sdksandbox \
com.android.appsearch:framework-appsearch \
- com.android.bluetooth:framework-bluetooth \
+ com.android.btservices:framework-bluetooth \
com.android.conscrypt:conscrypt \
com.android.i18n:core-icu4j \
com.android.ipsec:android.net.ipsec.ike \
@@ -93,7 +93,7 @@
# 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.bluetooth:service-bluetooth \
+ com.android.btservices:service-bluetooth \
com.android.os.statsd:service-statsd \
com.android.scheduling:service-scheduling \
com.android.tethering:service-connectivity \
