From fb72d542ad0a766683b86fc48b6a9301140eea04 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 12 Jul 2022 13:35:26 +0000 Subject: Add permission to the list of individually toggleable modules This is safe even though permission is not an optional mainline module because devices that support mainline must pass GTS and testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS currently tests this, along with testMainlineApprovedTrain which checks mandatory/optional, signing keys, and if what's preloaded are part of approved trains. Bug: 238175656 Test: # Cherry pick to branch that has Google signed prebuilts for # permission and builds from prebuilts by default. # Update the permission to an sdk snapshot generated with # r.android.com/2151273. # Make sure that the permission is built from prebuilts by # default Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 --- core/android_soong_config_vars.mk | 1 + 1 file changed, 1 insertion(+) 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 \ -- cgit v1.2.3 From d4bde8362d6738a97f5af32cde9a05d53cd88721 Mon Sep 17 00:00:00 2001 From: zhidou Date: Mon, 11 Jul 2022 20:12:24 +0000 Subject: Keep proguard fields for lite runtime of jarjared class Some targets rename protobuf.MessageLite with jarjar rules. This change adds keep rules to keep the fields of renamed classes. Bug: 233746531 Test: m checkbuild. Change-Id: I986f05455b45651749fb5f819661041d7399f683 --- core/proguard_basic_keeps.flags | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 { ; } +# 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 { ; } -- cgit v1.2.3