aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-04-20 13:51:48 -0700
committerColin Cross <ccross@android.com>2015-04-20 13:52:55 -0700
commit276284f577ea7ec29f7e78f8b23955a0b3b69032 (patch)
tree5c5483b89258f0671302f88f1b106a8f33800b19 /androidmk
parentd560a9e192694f4edf37364c6995627918efaafd (diff)
downloadbuild_soong-276284f577ea7ec29f7e78f8b23955a0b3b69032.tar.gz
build_soong-276284f577ea7ec29f7e78f8b23955a0b3b69032.tar.bz2
build_soong-276284f577ea7ec29f7e78f8b23955a0b3b69032.zip
Rename resource_dirs to java_resource_dirs
Java vs. Android resource directories are already confusing enough, rename resource_dirs to java_resource_dirs to make room for android_resource_dirs. Change-Id: Iffd087860b98df29e81d8d2f823be87c8227e614
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/android.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 8bbd4e35..3423d790 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -44,7 +44,7 @@ var listProperties = map[string]string{
"LOCAL_CLANG_CFLAGS": "clang_cflags",
"LOCAL_YACCFLAGS": "yaccflags",
- "LOCAL_JAVA_RESOURCE_DIRS": "resource_dirs",
+ "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs",
"LOCAL_JAVACFLAGS": "javacflags",
"LOCAL_DX_FLAGS": "dxflags",
"LOCAL_JAVA_LIBRARIES": "java_libs",