diff options
author | Colin Cross <ccross@android.com> | 2016-12-15 07:39:51 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-12-15 07:40:13 -0800 |
commit | 32ec36c631b46f064dafa68357bd7f21515db217 (patch) | |
tree | fd7fc9c80a1aa3b28e11da9a4c8433e3553367d8 /cc/cc.go | |
parent | 1bd40ba84b07c5c1e61e0dad634cf0fb97634360 (diff) | |
download | build_soong-32ec36c631b46f064dafa68357bd7f21515db217.tar.gz build_soong-32ec36c631b46f064dafa68357bd7f21515db217.tar.bz2 build_soong-32ec36c631b46f064dafa68357bd7f21515db217.zip |
Only export exported header libs
Test: m -j native
Change-Id: Ia0e5b28495e049ba8037884d2c498a1b59012bbe
Diffstat (limited to 'cc/cc.go')
-rw-r--r-- | cc/cc.go | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -227,7 +227,8 @@ var ( staticExportDepTag = dependencyTag{name: "static", library: true, reexportFlags: true} lateStaticDepTag = dependencyTag{name: "late static", library: true} wholeStaticDepTag = dependencyTag{name: "whole static", library: true, reexportFlags: true} - headerDepTag = dependencyTag{name: "header", library: true, reexportFlags: true} + headerDepTag = dependencyTag{name: "header", library: true} + headerExportDepTag = dependencyTag{name: "header", library: true, reexportFlags: true} genSourceDepTag = dependencyTag{name: "gen source"} genHeaderDepTag = dependencyTag{name: "gen header"} genHeaderExportDepTag = dependencyTag{name: "gen header", reexportFlags: true} @@ -663,7 +664,13 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { deps.LateSharedLibs, variantLateNdkLibs = rewriteNdkLibs(deps.LateSharedLibs) } - actx.AddVariationDependencies(nil, headerDepTag, deps.HeaderLibs...) + for _, lib := range deps.HeaderLibs { + depTag := headerDepTag + if inList(lib, deps.ReexportHeaderLibHeaders) { + depTag = headerExportDepTag + } + actx.AddVariationDependencies(nil, depTag, lib) + } actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, wholeStaticDepTag, deps.WholeStaticLibs...) |