p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add TARGET_PROJECT_INCLUDES as system includes 

And do the same to host modules.

Bug: 4279745
Change-Id: I5b0cd0e13e0e61b5051537b5834eba48e5f822f8
This commit is contained in:
Ying Wang 2011-04-18 11:45:44 -07:00
parent e480e7fd89
commit ddbcad8c85
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/definitions.mk
View File

@ -856,17 +856,11 @@ define transform-cpp-to-o
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<" @echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<"
$(hide) $(PRIVATE_CXX) \ $(hide) $(PRIVATE_CXX) \
$(foreach incdir, \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(PRIVATE_C_INCLUDES) \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_TARGET_PROJECT_INCLUDES) \
) \
, \
-I $(incdir) \
) \
$(addprefix -isystem ,\ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \ $(filter-out $(PRIVATE_C_INCLUDES), \
$(PRIVATE_TARGET_PROJECT_INCLUDES) \
$(PRIVATE_TARGET_C_INCLUDES)))) \ $(PRIVATE_TARGET_C_INCLUDES)))) \
-c \ -c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
@ -891,17 +885,11 @@ endef
define transform-c-or-s-to-o-no-deps define transform-c-or-s-to-o-no-deps
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(PRIVATE_CC) \ $(hide) $(PRIVATE_CC) \
$(foreach incdir, \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(PRIVATE_C_INCLUDES) \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_TARGET_PROJECT_INCLUDES) \
) \
, \
-I $(incdir) \
) \
$(addprefix -isystem ,\ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \ $(filter-out $(PRIVATE_C_INCLUDES), \
$(PRIVATE_TARGET_PROJECT_INCLUDES) \
$(PRIVATE_TARGET_C_INCLUDES)))) \ $(PRIVATE_TARGET_C_INCLUDES)))) \
-c \ -c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
@ -958,15 +946,12 @@ define transform-host-cpp-to-o
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo "host C++: $(PRIVATE_MODULE) <= $<" @echo "host C++: $(PRIVATE_MODULE) <= $<"
$(hide) $(PRIVATE_CXX) \ $(hide) $(PRIVATE_CXX) \
$(foreach incdir, \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(PRIVATE_C_INCLUDES) \ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \
$(HOST_PROJECT_INCLUDES) \ $(HOST_PROJECT_INCLUDES) \
$(HOST_C_INCLUDES) \ $(HOST_C_INCLUDES)))) \
) \
, \
-I $(incdir) \
) \
-c \ -c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(HOST_GLOBAL_CFLAGS) \ $(HOST_GLOBAL_CFLAGS) \
@ -988,15 +973,12 @@ endef
define transform-host-c-or-s-to-o-no-deps define transform-host-c-or-s-to-o-no-deps
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(PRIVATE_CC) \ $(hide) $(PRIVATE_CC) \
$(foreach incdir, \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(PRIVATE_C_INCLUDES) \ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \
$(HOST_PROJECT_INCLUDES) \ $(HOST_PROJECT_INCLUDES) \
$(HOST_C_INCLUDES) \ $(HOST_C_INCLUDES)))) \
) \
, \
-I $(incdir) \
) \
-c \ -c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(HOST_GLOBAL_CFLAGS) \ $(HOST_GLOBAL_CFLAGS) \