am 2ef85bd1: am d74b538d: Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes (07e8056b) · Commits · e / os / android_build

core/base_rules.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -186,9 +186,6 @@ ifneq ($(strip $(aidl_sources)),)
		aidl_java_sources := $(patsubst %.aidl,%.java,$(addprefix $(intermediates.COMMON)/src/, $(aidl_sources)))
		aidl_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(aidl_sources))

		ifeq (,$(TARGET_BUILD_APPS))
		LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
		endif
		aidl_preprocess_import :=
		LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))
		ifdef LOCAL_SDK_VERSION
		@@ -198,6 +195,9 @@ ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)
		else
		aidl_preprocess_import := $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/framework.aidl
		endif # !current
		else
		# build against the platform.
		LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
		endif # LOCAL_SDK_VERSION
		$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES))