diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 20:17:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-21 21:13:39 +0000 |
| commit | 9238b136f8d26c86edc5c308576bd0f75c14bb53 (patch) | |
| tree | 66831e7d65f0f98e2f73e78a81bb1de7aeb24580 | |
| parent | c759bcca3f0f4ba0ecb99a5fa7c870cb464c50d2 (diff) | |
| parent | 73797f870f910daa456800c819a6f8de36518d1d (diff) | |
| download | build-android13-mainline-go-ipsec-release.tar.gz | |
Make change and version bump to aml_go_ips_330911000 for mainline module file: Noneaml_go_ips_330911000android13-mainline-go-ipsec-release
Change-Id: I9c372a85dc8a249bb445266667012ae6a059a7e3
| -rw-r--r-- | core/android_soong_config_vars.mk | 1 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/proguard_basic_keeps.flags | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 483beaff3b..7e1e98ea97 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -76,6 +76,7 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) # default. INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ bluetooth \ + permission \ uwb \ wifi \ diff --git a/core/build_id.mk b/core/build_id.mk index 886fd86106..c48fa10d25 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=330910000 +BUILD_ID=330911000 diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags index 30c2341649..54cbdccf3b 100644 --- a/core/proguard_basic_keeps.flags +++ b/core/proguard_basic_keeps.flags @@ -74,5 +74,6 @@ -dontnote # The lite proto runtime uses reflection to access fields based on the names in -# the schema, keep all the fields. --keepclassmembers class * extends com.google.protobuf.MessageLite { <fields>; } +# 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>; } |