diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-11-26 15:37:29 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-26 15:37:29 -0800 |
| commit | 310a8ed1fa95111fcfe7c6d9b0d3019e6259bbc8 (patch) | |
| tree | 0afa429bea1f77e44f8e6ff96653cde2640ff8d2 | |
| parent | dd02481ceebc0ec3509a4215e027281d7cdc12f1 (diff) | |
| parent | f425c0964bd0f29c8227e59e1142561e55fcb86b (diff) | |
| download | build-310a8ed1fa95111fcfe7c6d9b0d3019e6259bbc8.tar.gz | |
Merge "Clean include directory paths"
am: f425c0964b
Change-Id: I2b0be61215018036bf0416ba74ea5b4d9cdff715
| -rw-r--r-- | core/binary.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/binary.mk b/core/binary.mk index 604315ef7b..e4805cd742 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 |