diff options
| author | Jiyong Park <jiyong@google.com> | 2019-07-17 08:21:36 +0900 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-17 03:10:27 +0000 |
| commit | 9863d53618714a36c3f254d949497a7eb2d11863 (patch) | |
| tree | 1425a089580634b8285954733e7ea2bca06e3f4a | |
| parent | b8650ff16bb7fe69370d38cb7002c7b0929067ed (diff) | |
| download | build_soong-9863d53618714a36c3f254d949497a7eb2d11863.tar.gz build_soong-9863d53618714a36c3f254d949497a7eb2d11863.tar.bz2 build_soong-9863d53618714a36c3f254d949497a7eb2d11863.zip | |
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
(cherry picked from commit 895e224d8fad6877918ef05545d7423a30d72c2b)
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index e5e58601..87c54f3b 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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()) || |