diff options
| author | Jiyong Park <jiyong@google.com> | 2019-07-29 21:27:18 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-08-16 13:46:06 +0900 |
| commit | d5bd6d36768200e9085c2406cdde718f0b0c72aa (patch) | |
| tree | 9ee384e3a1cacca5707240f78aec4c460bf3138b /android | |
| parent | e73a7df1baa243f81797e9529c2ac2dd8a1f5966 (diff) | |
| download | build_soong-d5bd6d36768200e9085c2406cdde718f0b0c72aa.tar.gz build_soong-d5bd6d36768200e9085c2406cdde718f0b0c72aa.tar.bz2 build_soong-d5bd6d36768200e9085c2406cdde718f0b0c72aa.zip | |
Fix sanitizer dep
This change fixes a problem in sanitizerMutator where a module is linked
with of non-sanitized variant of a lib at build-time, but is linked with
the sanitized variant of the lib at run-time.
This happened because, for each sanitizer type, every shared libs are
split into non-sanitized and sanitized variants, and then either of the
variants are suppressed from Make so that it isn't installed to the
device.
This change fixes the problem by NOT splitting for shared libs; only the
sanitized variant is created if needed. Header libs, static libs and
shared libs for a few sanitizer types (asan/fuzzer) are however split
into two. This is because the static and headers libs become part of the
depending module, and asan/fuzzer require that the depending module and
the dependant module should be compiled for the same sanitizer.
Bug: 138103882
Bug: 138426065
Test: m com.android.runtime.debug
Check that libziparchive exists under both
/system/apex/com.android.runtime/[lib|lib64]
Merged-In: Ia447785c485c0d049e19477b32bc638bfe6f1608
(cherry picked from commit 1d1119f4bd20368dc686c6980d80a3ea34311716)
Change-Id: Ia447785c485c0d049e19477b32bc638bfe6f1608
Diffstat (limited to 'android')
| -rw-r--r-- | android/mutator.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/mutator.go b/android/mutator.go index 71237a1c..e003f0bb 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -160,6 +160,7 @@ type BottomUpMutatorContext interface { CreateVariations(...string) []blueprint.Module CreateLocalVariations(...string) []blueprint.Module SetDependencyVariation(string) + SetDefaultDependencyVariation(*string) AddVariationDependencies([]blueprint.Variation, blueprint.DependencyTag, ...string) AddFarVariationDependencies([]blueprint.Variation, blueprint.DependencyTag, ...string) AddInterVariantDependency(tag blueprint.DependencyTag, from, to blueprint.Module) |