| commit | 34849ea08d4d51331779dd5bbf354d55e0192eb6 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <[email protected]> | Tue Nov 29 03:20:02 2022 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue Nov 29 03:20:02 2022 +0000 |
| tree | 413cfb5b7c4e97ef32a8f2a9716824ad5d9ba7a8 | |
| parent | 143c3cdd30556599e80b42785f8d7a56deba9851 [diff] | |
| parent | 1765cb1200e675bb1e2ca212331f4b5b12aa988c [diff] |
Merge "use aidl: local_include_dirs" am: 4b650ae198 am: 5aba2712c8 am: 1765cb1200 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/2320008 Change-Id: I75e1dcec1c9ad91e80059ccb50e7e76a83ff1d3a Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.mk b/Android.mk index 4e1ebf4..99e2272 100644 --- a/Android.mk +++ b/Android.mk
@@ -77,6 +77,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(BASE_DIR)) LOCAL_SRC_FILES += $(call all-proto-files-under, $(BASE_DIR)) LOCAL_SRC_FILES += $(call all-Iaidl-files-under, $(BASE_DIR)) +LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/java/ LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES)) LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)