diff options
| author | Jiyong Park <jiyong@google.com> | 2019-07-11 17:38:09 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-11 17:38:09 -0700 |
| commit | c835e6c66d40f21247a2935b887caec7473567e0 (patch) | |
| tree | 7fdbc5759ca8d6d2f0f53a27943a7979f55f273c | |
| parent | 3c8fd299a04914b293954b1f1a95f24398dc1781 (diff) | |
| parent | 3b98a509f19cb25e9734bb62ba0b592663ed8e4e (diff) | |
| download | build_soong-c835e6c66d40f21247a2935b887caec7473567e0.tar.gz build_soong-c835e6c66d40f21247a2935b887caec7473567e0.tar.bz2 build_soong-c835e6c66d40f21247a2935b887caec7473567e0.zip | |
Don't use APEX prebuilts when asan is on
am: 3b98a509f1
Change-Id: I65e29cfe0ccad3a9ba9253d0ebc7c0d3c04a369c
| -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 cd972942..9489f5bf 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1338,10 +1338,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 } |