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

Merge "fix: APEX prebuilts are disabled in platform build"

Browse Source
This commit is contained in:
Treehugger Robot
2019-07-17 04:00:48 +00:00
committed by Gerrit Code Review
parent 223e6a65b6 ca8992ea0b
commit a0eb5a899f
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

@@ -1443,7 +1443,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()) ||