summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-11-26 02:45:06 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-11-26 02:45:06 +0000
commitff9aa2b1aa25e15d004c2496fa079f08b947bc04 (patch)
treed7b834e580e29f2bdc03abe7625fa08d4e92ead8
parent01d0c56f32062afbe37a6dedf6cfe2795ffb526d (diff)
parent4380820944e96ec8179993ef9e3ac22c3ef092bd (diff)
Merge "Allow librecovery_ui_ext to set InstallInRoot() to true." into main
-rw-r--r--android/neverallow.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/android/neverallow.go b/android/neverallow.go
index 326150be5..22155043b 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -55,7 +55,7 @@ func init() {
AddNeverAllowRules(createJavaDeviceForHostRules()...)
AddNeverAllowRules(createCcSdkVariantRules()...)
AddNeverAllowRules(createUncompressDexRules()...)
- AddNeverAllowRules(createInitFirstStageRules()...)
+ AddNeverAllowRules(createInstallInRootAllowingRules()...)
AddNeverAllowRules(createProhibitFrameworkAccessRules()...)
AddNeverAllowRules(createCcStubsRule())
AddNeverAllowRules(createProhibitHeaderOnlyRule())
@@ -235,15 +235,16 @@ func createUncompressDexRules() []Rule {
}
}
-func createInitFirstStageRules() []Rule {
+func createInstallInRootAllowingRules() []Rule {
return []Rule{
NeverAllow().
Without("name", "init_first_stage_defaults").
Without("name", "init_first_stage").
Without("name", "init_first_stage.microdroid").
+ Without("name", "librecovery_ui_ext").
With("install_in_root", "true").
NotModuleType("prebuilt_root").
- Because("install_in_root is only for init_first_stage."),
+ Because("install_in_root is only for init_first_stage or librecovery_ui_ext."),
}
}