diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-07 22:20:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-07 23:15:34 +0000 |
| commit | e7a882dff351be94b36972647fbe6296d50719bb (patch) | |
| tree | 1c72670c304f584ea7150f9cd8e7007dd34c6932 | |
| parent | 5844a9a55aa9b68033c3265f45382dd23d39a966 (diff) | |
| parent | 5015273fa33b3326cf654c7b028280a66e2b0d9e (diff) | |
| download | build-aml_sta_330910000.tar.gz | |
Make change and version bump to aml_sta_330910000 for mainline module file: Noneaml_sta_330910000
Change-Id: I48cf62a709b133bc86ce21c29b768dfeccbe61bd
| -rw-r--r-- | core/android_soong_config_vars.mk | 3 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | target/product/base_system.mk | 2 | ||||
| -rw-r--r-- | target/product/default_art_config.mk | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 259035e054..483beaff3b 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -80,7 +80,8 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ 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 5b50f27592..886fd86106 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 6f6cd79214..c919ac462b 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.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 993edf3284..e2bb9d5dd4 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -54,7 +54,7 @@ PRODUCT_APEX_BOOT_JARS := \ 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 @@ 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.bluetooth:service-bluetooth \ + com.android.btservices:service-bluetooth \ com.android.os.statsd:service-statsd \ com.android.scheduling:service-scheduling \ com.android.tethering:service-connectivity \ |