diff options
| author | Steven Moreland <smoreland@google.com> | 2022-11-29 01:12:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-29 01:12:35 +0000 |
| commit | 5aba2712c8c0007738549b0f1815484236f43c46 (patch) | |
| tree | 413cfb5b7c4e97ef32a8f2a9716824ad5d9ba7a8 | |
| parent | 78b832047ba759375aacb6c9fb398d24890eb25c (diff) | |
| parent | 4b650ae1982f1b085e7ad1f115f59ece7aa701d5 (diff) | |
| download | Dialer-5aba2712c8c0007738549b0f1815484236f43c46.tar.gz | |
Merge "use aidl: local_include_dirs" am: 4b650ae198main-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/2320008
Change-Id: Ib59c0822f04774224e688a1659da40487419083f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 4e1ebf40b..99e2272b1 100644 --- a/Android.mk +++ b/Android.mk @@ -77,6 +77,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ 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) |