Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a249192c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow librecovery_ui_ext to set InstallInRoot() to true." into main am: ff9aa2b1 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3367177



Change-Id: I3c9df221e633b8241170fdf9e1a63cb1358bc70b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0147192e ff9aa2b1

android/neverallow.go

+4 −3
Original line number Diff line number Diff line
@@ -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."),

	}

}