diff options
author | Jiyong Park <jiyong@google.com> | 2019-01-30 09:34:29 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-30 09:34:29 -0800 |
commit | c4843f1d9ffeddcb755e88c6c59ff58a6f9ffd60 (patch) | |
tree | ab27b0735aabc3058caa367e877b87ffd4e94e1a /cc | |
parent | 11eda2d3dd091bc71b9d021abf03f9036314d4dd (diff) | |
parent | dc9872a0d39b67359193e003bb25e1ae4af5f8e2 (diff) | |
download | build_soong-c4843f1d9ffeddcb755e88c6c59ff58a6f9ffd60.tar.gz build_soong-c4843f1d9ffeddcb755e88c6c59ff58a6f9ffd60.tar.bz2 build_soong-c4843f1d9ffeddcb755e88c6c59ff58a6f9ffd60.zip |
Fix: deps to sanitizer runtime libs are with correct 'image' variant am: 3b1746a212
am: dc9872a0d3
Change-Id: I53c6b3a08b1c7e5a2a16e88e202d2eee3989567e
Diffstat (limited to 'cc')
-rw-r--r-- | cc/cc.go | 18 | ||||
-rw-r--r-- | cc/sanitize.go | 6 |
2 files changed, 15 insertions, 9 deletions
@@ -1175,15 +1175,9 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { depTag = headerExportDepTag } if buildStubs { - imageVariation := "core" - if c.useVndk() { - imageVariation = "vendor" - } else if c.inRecovery() { - imageVariation = "recovery" - } actx.AddFarVariationDependencies([]blueprint.Variation{ {Mutator: "arch", Variation: ctx.Target().String()}, - {Mutator: "image", Variation: imageVariation}, + {Mutator: "image", Variation: c.imageVariation()}, }, depTag, lib) } else { actx.AddVariationDependencies(nil, depTag, lib) @@ -1845,6 +1839,16 @@ func (c *Module) IsInstallableToApex() bool { return false } +func (c *Module) imageVariation() string { + variation := "core" + if c.useVndk() { + variation = "vendor" + } else if c.inRecovery() { + variation = "recovery" + } + return variation +} + // // Defaults // diff --git a/cc/sanitize.go b/cc/sanitize.go index b95e2a8d..4576aa10 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -787,7 +787,7 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { } if mctx.Device() && runtimeLibrary != "" { - if inList(runtimeLibrary, llndkLibraries) && !c.static() { + if inList(runtimeLibrary, llndkLibraries) && !c.static() && c.useVndk() { runtimeLibrary = runtimeLibrary + llndkLibrarySuffix } @@ -802,12 +802,14 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { // static executable gets static runtime libs mctx.AddFarVariationDependencies([]blueprint.Variation{ {Mutator: "link", Variation: "static"}, + {Mutator: "image", Variation: c.imageVariation()}, {Mutator: "arch", Variation: mctx.Target().String()}, }, staticDepTag, runtimeLibrary) } else if !c.static() { - // dynamic executable andshared libs get shared runtime libs + // dynamic executable and shared libs get shared runtime libs mctx.AddFarVariationDependencies([]blueprint.Variation{ {Mutator: "link", Variation: "shared"}, + {Mutator: "image", Variation: c.imageVariation()}, {Mutator: "arch", Variation: mctx.Target().String()}, }, earlySharedDepTag, runtimeLibrary) } |