aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2017-07-05 13:41:55 +0900
committerDan Willemsen <dwillemsen@google.com>2017-07-05 22:44:09 +0000
commit4c35af09ea774288959b347d81365329b13be3a1 (patch)
tree978333c39603fd0b368c068f331bda2fc3cded59 /cc
parent36242850fdad11b4e6fbe061ef30f62e7e8c08d8 (diff)
downloadbuild_soong-4c35af09ea774288959b347d81365329b13be3a1.tar.gz
build_soong-4c35af09ea774288959b347d81365329b13be3a1.tar.bz2
build_soong-4c35af09ea774288959b347d81365329b13be3a1.zip
fix: a vendor variant of a lib doesn't re-export llndk headers
If a vendor (or vendor_available) lib has a dependency to a llndk library, the name of the llndk library is modified to <name>.llndk. There was a bug that this name modification is done only for shared_libs property, but not for export_shared_lib_headers property. As a result, the headers of the llndk was not re-exported. Fix the bug by modifying export_shared_lib_headers property as well. Bug: 63178444 Test: build Test: look into out/soong/Android-<target>.mk. libutils.vendor has system/core/liblog/include_vndk in its LOCAL_EXPORT_CFLAGS. Change-Id: I6fcb1036cdb81ba167ead815b436a5cada283ede
Diffstat (limited to 'cc')
-rw-r--r--cc/cc.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/cc.go b/cc/cc.go
index a3f4c1d2..c17b95e5 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -728,6 +728,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
deps.SharedLibs, variantNdkLibs = rewriteNdkLibs(deps.SharedLibs)
deps.LateSharedLibs, variantLateNdkLibs = rewriteNdkLibs(deps.LateSharedLibs)
+ deps.ReexportSharedLibHeaders, _ = rewriteNdkLibs(deps.ReexportSharedLibHeaders)
}
for _, lib := range deps.HeaderLibs {