am 4733cfd2
: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
* commit '4733cfd2de0bed2dfdf4c32517b0c59762c85b2e': definitions.mk: Don't use GCC '@' parameter
This commit is contained in:
committed by
Android Git Automerger
commit
a481437072
@@ -883,7 +883,7 @@ define transform-cpp-to-o
|
|||||||
@echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<"
|
@echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<"
|
||||||
$(hide) $(PRIVATE_CXX) \
|
$(hide) $(PRIVATE_CXX) \
|
||||||
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
||||||
@$(PRIVATE_IMPORT_INCLUDES) \
|
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \
|
||||||
$(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), \
|
||||||
@@ -913,7 +913,7 @@ define transform-c-or-s-to-o-no-deps
|
|||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
$(hide) $(PRIVATE_CC) \
|
$(hide) $(PRIVATE_CC) \
|
||||||
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
||||||
@$(PRIVATE_IMPORT_INCLUDES) \
|
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \
|
||||||
$(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), \
|
||||||
@@ -975,7 +975,7 @@ define transform-host-cpp-to-o
|
|||||||
@echo "host C++: $(PRIVATE_MODULE) <= $<"
|
@echo "host C++: $(PRIVATE_MODULE) <= $<"
|
||||||
$(hide) $(PRIVATE_CXX) \
|
$(hide) $(PRIVATE_CXX) \
|
||||||
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
||||||
@$(PRIVATE_IMPORT_INCLUDES) \
|
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \
|
||||||
$(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), \
|
||||||
@@ -1003,7 +1003,7 @@ define transform-host-c-or-s-to-o-no-deps
|
|||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
$(hide) $(PRIVATE_CC) \
|
$(hide) $(PRIVATE_CC) \
|
||||||
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
|
||||||
@$(PRIVATE_IMPORT_INCLUDES) \
|
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \
|
||||||
$(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), \
|
||||||
|
Reference in New Issue
Block a user