From 3ec92f26957002ed37c1946550668b6314ec8a61 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 12 Jul 2022 13:35:26 +0000 Subject: [PATCH] Add permission to the list of individually toggleable modules (cherry-picked from fb72d542ad0a766683b86fc48b6a9301140eea04) 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 Merged-In: 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 cdd48e7cc6..e229e6b5ff 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -75,6 +75,7 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) # are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by # default. INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \ + permission \ wifi \ $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\