openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Error on external includes" 

am: 4b33f51043

* commit '4b33f510436f88774f5217b472835973fd8d5b2b':
  Error on external includes

Change-Id: Ib2fb1470cee531cb043e7fe4a8e310fb026dcb3c
This commit is contained in:
Dan Willemsen 2016-06-04 01:09:52 +00:00 committed by android-build-merger
parent b764f7d0d6 4b33f51043
commit d983b78a6f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/binary.mk
View File

@ -1228,6 +1228,11 @@ ifndef LOCAL_SDK_VERSION
my_c_includes += $(JNI_H_INCLUDE)
endif
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))
endif
# all_objects includes gen_o_objects which were part of LOCAL_GENERATED_SOURCES;
# use normal_objects here to avoid creating circular dependencies. This assumes
# that custom build rules which generate .o files don't consume other generated