diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-04-06 12:49:58 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-04-07 14:59:18 -0700 |
| commit | aa118f95a675a788e9a9554b9ab220d4e41749fd (patch) | |
| tree | b447c97d17e7a4a46dba986fb033fc5fd956581f /androidmk | |
| parent | b916b80bf301545595a8263776180c1db90a9ccc (diff) | |
| download | build_soong-aa118f95a675a788e9a9554b9ab220d4e41749fd.tar.gz build_soong-aa118f95a675a788e9a9554b9ab220d4e41749fd.tar.bz2 build_soong-aa118f95a675a788e9a9554b9ab220d4e41749fd.zip | |
Implement vendor as a synonym of proprietary
The vendor image will have more than just proprietary modules in it
under Treble, so let's stop marking open source code as proprietary just
to move it to vendor.
Bug: 36452052
Bug: 37134596
Test: compare build.ninja before/after, no changes.
Test: Set vendor: true, ensure it works.
Change-Id: I44b0ec7007d0e311bdcbd44b238b1ef2d05cc6ff
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 33e7eb39..bd9d8ee0 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -69,12 +69,12 @@ func init() { "LOCAL_PACKAGE_NAME": "name", "LOCAL_MODULE_RELATIVE_PATH": "relative_install_path", "LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type", - "LOCAL_HEADER_LIBRARIES": "header_libs", "LOCAL_MODULE_OWNER": "owner", }) addStandardProperties(bpparser.ListType, map[string]string{ "LOCAL_SRC_FILES_EXCLUDE": "exclude_srcs", + "LOCAL_HEADER_LIBRARIES": "header_libs", "LOCAL_SHARED_LIBRARIES": "shared_libs", "LOCAL_STATIC_LIBRARIES": "static_libs", "LOCAL_WHOLE_STATIC_LIBRARIES": "whole_static_libs", @@ -90,6 +90,7 @@ func init() { "LOCAL_YACCFLAGS": "yaccflags", "LOCAL_SANITIZE_RECOVER": "sanitize.recover", "LOCAL_LOGTAGS_FILES": "logtags", + "LOCAL_EXPORT_HEADER_LIBRARY_HEADERS": "export_header_lib_headers", "LOCAL_EXPORT_SHARED_LIBRARY_HEADERS": "export_shared_lib_headers", "LOCAL_EXPORT_STATIC_LIBRARY_HEADERS": "export_static_lib_headers", "LOCAL_INIT_RC": "init_rc", @@ -121,6 +122,7 @@ func init() { "LOCAL_PACK_MODULE_RELOCATIONS": "pack_relocations", "LOCAL_TIDY": "tidy", "LOCAL_PROPRIETARY_MODULE": "proprietary", + "LOCAL_VENDOR_MODULE": "vendor", "LOCAL_EXPORT_PACKAGE_RESOURCES": "export_package_resources", }) |