diff options
| author | Colin Cross <ccross@android.com> | 2017-07-19 11:22:16 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-07-19 23:19:58 +0000 |
| commit | e8dc34a3721617cb43a73b45627ff0a99d8eb436 (patch) | |
| tree | a41d5883591e5fc4aa50cf79d39cac7bd0619e0c /androidmk | |
| parent | be1da475d0b1a398b8d05f93b9b76cab2b45f3a3 (diff) | |
| download | build_soong-e8dc34a3721617cb43a73b45627ff0a99d8eb436.tar.gz build_soong-e8dc34a3721617cb43a73b45627ff0a99d8eb436.tar.bz2 build_soong-e8dc34a3721617cb43a73b45627ff0a99d8eb436.zip | |
Rename java module and property names for consistency
prebuilt_java_library -> java_prebuilt_library
prebuilt_sdk -> android_prebuilt_sdk
java_resource_dirs -> resource_dirs
exclude_java_resource_dirs -> exclude_resource_dirs
java_libs -> libs
java_static_libs -> static_libs
Test: java_test.go
Change-Id: Icb0eefa6663844e20ad0a8729fb2c90ec916c3eb
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 78395c33..194b2c93 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -102,11 +102,11 @@ func init() { "LOCAL_RENDERSCRIPT_INCLUDES": "renderscript.include_dirs", "LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags", - "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs", + "LOCAL_JAVA_RESOURCE_DIRS": "resource_dirs", "LOCAL_JAVACFLAGS": "javacflags", "LOCAL_DX_FLAGS": "dxflags", - "LOCAL_JAVA_LIBRARIES": "java_libs", - "LOCAL_STATIC_JAVA_LIBRARIES": "java_static_libs", + "LOCAL_JAVA_LIBRARIES": "libs", + "LOCAL_STATIC_JAVA_LIBRARIES": "static_libs", "LOCAL_AIDL_INCLUDES": "aidl.include_dirs", "LOCAL_AAPT_FLAGS": "aaptflags", "LOCAL_PACKAGE_SPLITS": "package_splits", |