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

Commit 4358b7cc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018,... 

Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release

Change-Id: I8627c84d2d0872d28a821f838cd12e6fb0e22288
parents 9f4175c5 b1d60cb9

apex/apex.go

+10 −4
Original line number Diff line number Diff line
@@ -1327,10 +1327,16 @@ func (p *Prebuilt) installable() bool { 
}



func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) {

	if ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild() && p.prebuilt.SourceExists() {

	// If the device is configured to use flattened APEX, don't set

	// p.properties.Source so that the prebuilt module (which is

	// a non-flattened APEX) is not used.

	forceDisable := ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild()



	// b/137216042 don't use prebuilts when address sanitizer is on

	forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) ||

		android.InList("hwaddress", ctx.Config().SanitizeDevice())



	if forceDisable && p.prebuilt.SourceExists() {

		p.properties.ForceDisable = true

		return

	}