aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk/cmd
diff options
context:
space:
mode:
authorJeff Gaston <jeffrygaston@google.com>2017-05-15 11:46:04 -0700
committerJeff Gaston <jeffrygaston@google.com>2017-05-15 11:46:04 -0700
commitfa833bb6d50e3da6463108564e14c490fa845d6d (patch)
treebfbbe5e8bdcf3f4b7467d9b11078b7a2cdd393f7 /androidmk/cmd
parent02f3add3a33ce563fb1172923ca0b5321f0edce1 (diff)
downloadbuild_soong-fa833bb6d50e3da6463108564e14c490fa845d6d.tar.gz
build_soong-fa833bb6d50e3da6463108564e14c490fa845d6d.tar.bz2
build_soong-fa833bb6d50e3da6463108564e14c490fa845d6d.zip
Support for LOCAL_AIDL_INCLUDES in androidmk
Now it converts to: aidl: { include_dirs: [ "...", ] } Bug: 37747936 Test: run androidmk against an Android.mk file having LOCAL_AIDLE_INCLUDES Change-Id: If9f4c3ee9969610f1e0e0f147ee6a70102b63edc
Diffstat (limited to 'androidmk/cmd')
-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 8801b34b..78395c33 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -107,7 +107,7 @@ func init() {
"LOCAL_DX_FLAGS": "dxflags",
"LOCAL_JAVA_LIBRARIES": "java_libs",
"LOCAL_STATIC_JAVA_LIBRARIES": "java_static_libs",
- "LOCAL_AIDL_INCLUDES": "aidl_includes",
+ "LOCAL_AIDL_INCLUDES": "aidl.include_dirs",
"LOCAL_AAPT_FLAGS": "aaptflags",
"LOCAL_PACKAGE_SPLITS": "package_splits",
"LOCAL_COMPATIBILITY_SUITE": "test_suites",