diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-08 13:32:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-08 14:27:53 +0000 |
| commit | 73615f2011f9790117c1cedbed89c5fb64135c9d (patch) | |
| tree | 5a603813ee578eb0323cbe66074659beead2ab21 | |
| parent | 4ca4acd9f8c885f29e61f8143dddce870173dff7 (diff) | |
| parent | a4944b18763a234d4f97fc948578673d8ece66ef (diff) | |
| download | build-android13-mainline-go-sdkext-release.tar.gz | |
Make change and version bump to aml_go_sdk_330810000 for mainline module file: Noneaml_go_sdk_330810000android13-mainline-go-sdkext-release
Change-Id: I770c9ecc6dfbecbede24d05d46a59d16da1b9286
| -rw-r--r-- | core/android_soong_config_vars.mk | 4 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/proguard_basic_keeps.flags | 5 | ||||
| -rw-r--r-- | target/product/default_art_config.mk | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 7e1e98ea97..259035e054 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -76,13 +76,11 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) # default. INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ bluetooth \ - permission \ uwb \ wifi \ $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\ - $(if $(call soong_config_get,$(m)_module,source_build),,\ - $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE)))) + $(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 c48fa10d25..2a12291ad5 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=330911000 +BUILD_ID=330810000 diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags index 54cbdccf3b..30c2341649 100644 --- a/core/proguard_basic_keeps.flags +++ b/core/proguard_basic_keeps.flags @@ -74,6 +74,5 @@ -dontnote # The lite proto runtime uses reflection to access fields based on the names in -# the schema, keep all the fields. Wildcard is used to apply the rule to classes -# that have been renamed with jarjar. --keepclassmembers class * extends **.protobuf.MessageLite { <fields>; } +# the schema, keep all the fields. +-keepclassmembers class * extends com.google.protobuf.MessageLite { <fields>; } diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index e2bb9d5dd4..993edf3284 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.btservices:framework-bluetooth \ + com.android.bluetooth: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.btservices:service-bluetooth \ + com.android.bluetooth:service-bluetooth \ com.android.os.statsd:service-statsd \ com.android.scheduling:service-scheduling \ com.android.tethering:service-connectivity \ |