aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-02-15 16:15:21 -0800
committerDan Willemsen <dwillemsen@google.com>2017-02-16 10:58:26 -0800
commitd5781347e0b2d6c7f25285580eb7115fcf9b66eb (patch)
tree91dbec03e2b926168354eafe7982d26196f9d996 /androidmk
parent449887957cab752f993b55cc5ffe72afed9a4420 (diff)
downloadbuild_soong-d5781347e0b2d6c7f25285580eb7115fcf9b66eb.tar.gz
build_soong-d5781347e0b2d6c7f25285580eb7115fcf9b66eb.tar.bz2
build_soong-d5781347e0b2d6c7f25285580eb7115fcf9b66eb.zip
Export cc_library_headers as BUILD_HEADER_LIBRARY
And support the reverse translation in androidmk. Test: Use a cc_library_headers using LOCAL_HEADER_LIBRARIES in make Test: androidmk with LOCAL_HEADER_LIBRARIES Test: androidmk with soong's Android-*.mk file for BUILD_HEADER_LIBRARIES Change-Id: I17adedb62151f62e67e2168b09ad87f1d5648df6
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/android.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 72ececbf..8f0ebdfd 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -38,6 +38,7 @@ var standardProperties = map[string]struct {
"LOCAL_STATIC_LIBRARIES": {"static_libs", bpparser.ListType},
"LOCAL_WHOLE_STATIC_LIBRARIES": {"whole_static_libs", bpparser.ListType},
"LOCAL_SYSTEM_SHARED_LIBRARIES": {"system_shared_libs", bpparser.ListType},
+ "LOCAL_HEADER_LIBRARIES": {"header_libs", bpparser.ListType},
"LOCAL_ASFLAGS": {"asflags", bpparser.ListType},
"LOCAL_CLANG_ASFLAGS": {"clang_asflags", bpparser.ListType},
"LOCAL_CFLAGS": {"cflags", bpparser.ListType},
@@ -572,6 +573,7 @@ var moduleTypes = map[string]string{
"BUILD_STATIC_LIBRARY": "cc_library_static",
"BUILD_HOST_SHARED_LIBRARY": "cc_library_host_shared",
"BUILD_HOST_STATIC_LIBRARY": "cc_library_host_static",
+ "BUILD_HEADER_LIBRARY": "cc_library_headers",
"BUILD_EXECUTABLE": "cc_binary",
"BUILD_HOST_EXECUTABLE": "cc_binary_host",
"BUILD_NATIVE_TEST": "cc_test",