StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: APEX prebuilts are disabled in platform build

Browse Source 
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
This commit is contained in:
Jiyong Park
2019-07-17 08:21:36 +09:00
parent 7610ba915c
commit 895e224d8f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -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 // Force disable the prebuilts when we are doing unbundled build. We do unbundled build
// to build the prebuilts themselves. // 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 // b/137216042 don't use prebuilts when address sanitizer is on
forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) || forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) ||