diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-17 03:11:37 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-17 03:11:37 +0000 |
| commit | 8fa121dc8905d109dc9461c7810c8d70449132f8 (patch) | |
| tree | 1425a089580634b8285954733e7ea2bca06e3f4a /apex | |
| parent | 4358b7cc045b62ca28015a88506469f571d92d52 (diff) | |
| parent | 9863d53618714a36c3f254d949497a7eb2d11863 (diff) | |
| download | build_soong-android-cts-10.0_r2.tar.gz build_soong-android-cts-10.0_r2.tar.bz2 build_soong-android-cts-10.0_r2.zip | |
Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855, 8673151, 8673594, 8673499, 8673799, 8673895, 8673896] into qt-releaseandroid-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-security-10.0.0_r48android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1
Change-Id: I4173c76b7399b84f27ab3c513f11b82a78320e77
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/apex.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 04b667f8..87c54f3b 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1327,10 +1327,13 @@ func (p *Prebuilt) installable() bool { } func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { - // 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() + // If the device is configured to use flattened APEX, force disable the prebuilt because + // the prebuilt is a non-flattened one. + forceDisable := ctx.Config().FlattenApex() + + // Force disable the prebuilts when we are doing unbundled build. We do unbundled build + // to build the prebuilts themselves. + forceDisable = forceDisable || ctx.Config().UnbundledBuild() // b/137216042 don't use prebuilts when address sanitizer is on forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) || |