summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2019-06-10 18:21:27 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-10 18:21:27 -0700
commitaf62f8f6a331cf134e4dd6afdb95d6067e20c34c (patch)
tree7d528f2c3358f4b3bf1aa08a05805a943ac0c3fa
parenta409c6b1d506c674a5f7d9e96a74e5d63558c97d (diff)
parent3a2e2153b7d9349b89a691748e9888719431e4ce (diff)
Merge "Remove improper LOCAL_AIDL_INCLUDES" am: cca2453024 am: c87917f39b
am: 3a2e2153b7 Change-Id: I8d14a5174f84c8fc2700e6bd9d69e0b57405d3bf
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index eb6798cb7..b7a4a8ffe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,8 +79,6 @@ LOCAL_SRC_FILES += $(call all-proto-files-under, $(BASE_DIR))
LOCAL_SRC_FILES += $(call all-Iaidl-files-under, $(BASE_DIR))
LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
-LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, $(BASE_DIR))
-
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))