diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-12 04:10:47 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-12 04:10:47 +0000 |
commit | 4358b7cc045b62ca28015a88506469f571d92d52 (patch) | |
tree | be3e2d1dcdec1b70931fa8621f016be3e2e2a780 | |
parent | 9f4175c5837a93210850a5fda47f4f99c74c9351 (diff) | |
parent | b1d60cb998703fb950e39e4fb10d86476f3f0dce (diff) | |
download | build_soong-4358b7cc045b62ca28015a88506469f571d92d52.tar.gz build_soong-4358b7cc045b62ca28015a88506469f571d92d52.tar.bz2 build_soong-4358b7cc045b62ca28015a88506469f571d92d52.zip |
Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release
Change-Id: I8627c84d2d0872d28a821f838cd12e6fb0e22288
-rw-r--r-- | apex/apex.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 3726684c..04b667f8 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1327,10 +1327,16 @@ func (p *Prebuilt) installable() bool { } func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { - if ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild() && p.prebuilt.SourceExists() { - // 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. + // 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() + + // b/137216042 don't use prebuilts when address sanitizer is on + forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) || + android.InList("hwaddress", ctx.Config().SanitizeDevice()) + + if forceDisable && p.prebuilt.SourceExists() { p.properties.ForceDisable = true return } |