diff options
Diffstat (limited to 'apex/apex.go')
-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()) || |