diff --git a/core/binary.mk b/core/binary.mk index 604315ef7..e4805cd74 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1296,6 +1296,8 @@ ifeq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),) my_c_includes += $(JNI_H_INCLUDE) endif +my_c_includes := $(foreach inc,$(my_c_includes),$(call clean-path,$(inc))) + my_outside_includes := $(filter-out $(OUT_DIR)/%,$(filter /%,$(my_c_includes))) ifneq ($(my_outside_includes),) $(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): C_INCLUDES must be under the source or output directories: $(my_outside_includes)) @@ -1803,7 +1805,7 @@ export_include_deps += $(strip \ ifneq ($(strip $(my_export_c_include_dirs)$(export_include_deps)),) EXPORTS_LIST := $(EXPORTS_LIST) $(intermediates) - EXPORTS.$(intermediates).FLAGS := $(foreach d,$(my_export_c_include_dirs),-I $(d)) + EXPORTS.$(intermediates).FLAGS := $(foreach d,$(my_export_c_include_dirs),-I $(call clean-path,$(d))) EXPORTS.$(intermediates).REEXPORT := $(export_include_deps) EXPORTS.$(intermediates).DEPS := $(my_export_c_include_deps) $(my_generated_sources) $(LOCAL_EXPORT_C_INCLUDE_DEPS) endif