diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-23 23:00:48 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-23 23:57:25 +0000 |
| commit | 484c92b3382359d5dbccc300b5bc87b4858743a3 (patch) | |
| tree | 0357dc11a357771e701c50b54fe0d56baf7bd5de | |
| parent | 6bae6fd35417ad2e39c94b2e603b94193d07fd2d (diff) | |
| parent | dccd189954c52d2726cfd287a7a230f4b837f285 (diff) | |
| download | build-484c92b3382359d5dbccc300b5bc87b4858743a3.tar.gz | |
Make change and version bump to TP1A.220624.001
Change-Id: I85d4698f1b063d1fd1ecd38d004f6e67ce317600
| -rw-r--r-- | core/android_soong_config_vars.mk | 3 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | target/product/default_art_config.mk | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 711518ed70..2880b287c5 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -130,7 +130,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 861310384f..28ef816ca9 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=TP1A.220623.001 +BUILD_ID=TP1A.220624.001 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 \ |