Merge "Support for LOCAL_AIDL_INCLUDES in androidmk" am: b4a3288be8

am: 748e0eddc1

Change-Id: Iafb1956c69f24469187211df71985b0db1cba500
This commit is contained in:
Jeff Gaston
2017-05-16 01:15:29 +00:00
committed by android-build-merger

View File

@@ -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",