Only export exported header libs
Test: m -j native
Change-Id: Ia0e5b28495e049ba8037884d2c498a1b59012bbe
diff --git a/cc/cc.go b/cc/cc.go
index 74d3d3d..a17108f 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -227,7 +227,8 @@
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 @@
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...)