aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-06-06 18:22:19 -0700
committerDan Willemsen <dwillemsen@google.com>2016-06-06 18:35:57 -0700
commit490a8dc2d5cd742a46926850beac8e96446c4be4 (patch)
tree06245072760813fee2b6168a904cb3f521a49668 /androidmk
parent0c41054beccd52c1bcc90347a74fd41a90d72f45 (diff)
downloadbuild_soong-490a8dc2d5cd742a46926850beac8e96446c4be4.tar.gz
build_soong-490a8dc2d5cd742a46926850beac8e96446c4be4.tar.bz2
build_soong-490a8dc2d5cd742a46926850beac8e96446c4be4.zip
Implement re-exporting of library headers
This matches LOCAL_EXPORT_(SHARED|STATIC)_LIBRARY_HEADERS in Make. Change-Id: Iede67e2c24a24cf51e68a50123299effbe4e4196
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/android.go36
1 files changed, 19 insertions, 17 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index d4802744..8f4895b6 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -32,23 +32,25 @@ var standardProperties = map[string]struct {
"LOCAL_MODULE_RELATIVE_PATH": {"relative_install_path", bpparser.String},
// List properties
- "LOCAL_SRC_FILES_EXCLUDE": {"exclude_srcs", bpparser.List},
- "LOCAL_SHARED_LIBRARIES": {"shared_libs", bpparser.List},
- "LOCAL_STATIC_LIBRARIES": {"static_libs", bpparser.List},
- "LOCAL_WHOLE_STATIC_LIBRARIES": {"whole_static_libs", bpparser.List},
- "LOCAL_SYSTEM_SHARED_LIBRARIES": {"system_shared_libs", bpparser.List},
- "LOCAL_ASFLAGS": {"asflags", bpparser.List},
- "LOCAL_CLANG_ASFLAGS": {"clang_asflags", bpparser.List},
- "LOCAL_CFLAGS": {"cflags", bpparser.List},
- "LOCAL_CONLYFLAGS": {"conlyflags", bpparser.List},
- "LOCAL_CPPFLAGS": {"cppflags", bpparser.List},
- "LOCAL_REQUIRED_MODULES": {"required", bpparser.List},
- "LOCAL_MODULE_TAGS": {"tags", bpparser.List},
- "LOCAL_LDLIBS": {"host_ldlibs", bpparser.List},
- "LOCAL_CLANG_CFLAGS": {"clang_cflags", bpparser.List},
- "LOCAL_YACCFLAGS": {"yaccflags", bpparser.List},
- "LOCAL_SANITIZE_RECOVER": {"sanitize.recover", bpparser.List},
- "LOCAL_LOGTAGS_FILES": {"logtags", bpparser.List},
+ "LOCAL_SRC_FILES_EXCLUDE": {"exclude_srcs", bpparser.List},
+ "LOCAL_SHARED_LIBRARIES": {"shared_libs", bpparser.List},
+ "LOCAL_STATIC_LIBRARIES": {"static_libs", bpparser.List},
+ "LOCAL_WHOLE_STATIC_LIBRARIES": {"whole_static_libs", bpparser.List},
+ "LOCAL_SYSTEM_SHARED_LIBRARIES": {"system_shared_libs", bpparser.List},
+ "LOCAL_ASFLAGS": {"asflags", bpparser.List},
+ "LOCAL_CLANG_ASFLAGS": {"clang_asflags", bpparser.List},
+ "LOCAL_CFLAGS": {"cflags", bpparser.List},
+ "LOCAL_CONLYFLAGS": {"conlyflags", bpparser.List},
+ "LOCAL_CPPFLAGS": {"cppflags", bpparser.List},
+ "LOCAL_REQUIRED_MODULES": {"required", bpparser.List},
+ "LOCAL_MODULE_TAGS": {"tags", bpparser.List},
+ "LOCAL_LDLIBS": {"host_ldlibs", bpparser.List},
+ "LOCAL_CLANG_CFLAGS": {"clang_cflags", bpparser.List},
+ "LOCAL_YACCFLAGS": {"yaccflags", bpparser.List},
+ "LOCAL_SANITIZE_RECOVER": {"sanitize.recover", bpparser.List},
+ "LOCAL_LOGTAGS_FILES": {"logtags", bpparser.List},
+ "LOCAL_EXPORT_SHARED_LIBRARY_HEADERS": {"export_shared_lib_headers", bpparser.List},
+ "LOCAL_EXPORT_STATIC_LIBRARY_HEADERS": {"export_static_lib_headers", bpparser.List},
"LOCAL_JAVA_RESOURCE_DIRS": {"java_resource_dirs", bpparser.List},
"LOCAL_JAVACFLAGS": {"javacflags", bpparser.List},