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

Commit 895e224d authored by Jiyong Park's avatar Jiyong Park
Browse files

fix: APEX prebuilts are disabled in platform build 

This change fixes a bug that APEX prebuilts are auto-disabled in
platform builds (i.e. non-unbundled builds).

Bug: 137282010
Test: m com.android.conscrypt
check that the apex is from prebuilt directory

Change-Id: I935ef3896e80864bdcc1ca5f6fc12b63c9588c0d
parent 7610ba91

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -1333,7 +1333,7 @@ func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { 


	// Force disable the prebuilts when we are doing unbundled build. We do unbundled build

	// to build the prebuilts themselves.

	forceDisable = forceDisable || !ctx.Config().UnbundledBuild()

	forceDisable = forceDisable || ctx.Config().UnbundledBuild()



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

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