aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-09-27 17:33:10 -0700
committerColin Cross <ccross@android.com>2017-09-27 23:21:36 -0700
commit86a63ff366f386f9ff29e5092a724faad95b05dd (patch)
treef8208cd0d97bbc715e66d32ae9d01c4d2d4ab016 /androidmk
parentbd425497437e92d5b313702122586ab2ea5d6276 (diff)
downloadbuild_soong-86a63ff366f386f9ff29e5092a724faad95b05dd.tar.gz
build_soong-86a63ff366f386f9ff29e5092a724faad95b05dd.tar.bz2
build_soong-86a63ff366f386f9ff29e5092a724faad95b05dd.zip
Rename resource_dirs to java_resource_dirs
For consistency with make, rename java resources to java_resource_dirs and android resources to resource_dirs. Test: m -j checkbuild Change-Id: Ie9aac50fef40f6a9093b4b98759e79cd086bb797
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 469e960d..67973129 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -107,7 +107,7 @@ func init() {
"LOCAL_RENDERSCRIPT_INCLUDES": "renderscript.include_dirs",
"LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags",
- "LOCAL_JAVA_RESOURCE_DIRS": "resource_dirs",
+ "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs",
"LOCAL_JAVACFLAGS": "javacflags",
"LOCAL_DX_FLAGS": "dxflags",
"LOCAL_JAVA_LIBRARIES": "libs",