commit 1765cb1200e675bb1e2ca212331f4b5b12aa988c
author Steven Moreland <smoreland@google.com> Tue Nov 29 02:13:49 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 29 02:13:49 2022 +0000
tree 413cfb5b7c4e97ef32a8f2a9716824ad5d9ba7a8
parent be183c08890800a317387a39136757d04094bb5f
parent 5aba2712c8c0007738549b0f1815484236f43c46

Merge "use aidl: local_include_dirs" am: 4b650ae198 am: 5aba2712c8

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/2320008

Change-Id: I2e962837ef0a7149dea4e9f49b5128b07b175212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.mk

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)