Factor out common include directories into helper
Refactor includes in transform-*-to-o to simplify future changes to the
default include paths.
Test: whitespace-only changes to the compile rules in build.ninja
Change-Id: I766af1f22a4838d933691b6df37530db3ba4e21d
diff --git a/core/definitions.mk b/core/definitions.mk
index a1df134..6bd9cf0 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1149,19 +1149,24 @@
$(filter %.dbus-xml,$^)
endef
+###########################################################
+## Helper to set include paths form transform-*-to-o
+###########################################################
+define c-includes
+$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
+$$(cat $(PRIVATE_IMPORT_INCLUDES))\
+$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),,\
+ $(addprefix -isystem ,\
+ $(filter-out $(PRIVATE_C_INCLUDES), \
+ $(PRIVATE_GLOBAL_C_INCLUDES))))
+endef
###########################################################
## Commands for running gcc to compile a C++ file
###########################################################
define transform-cpp-to-o-compiler-args
- $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
- $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
- $(addprefix -isystem ,\
- $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
- $(filter-out $(PRIVATE_C_INCLUDES), \
- $(PRIVATE_TARGET_PROJECT_INCLUDES) \
- $(PRIVATE_TARGET_C_INCLUDES)))) \
+ $(c-includes) \
-c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_TARGET_GLOBAL_CFLAGS) \
@@ -1207,13 +1212,7 @@
# $(1): extra flags
define transform-c-or-s-to-o-compiler-args
- $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
- $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
- $(addprefix -isystem ,\
- $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
- $(filter-out $(PRIVATE_C_INCLUDES), \
- $(PRIVATE_TARGET_PROJECT_INCLUDES) \
- $(PRIVATE_TARGET_C_INCLUDES)))) \
+ $(c-includes) \
-c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_TARGET_GLOBAL_CFLAGS) \
@@ -1299,13 +1298,7 @@
###########################################################
define transform-host-cpp-to-o-compiler-args
- $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
- $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
- $(addprefix -isystem ,\
- $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
- $(filter-out $(PRIVATE_C_INCLUDES), \
- $($(PRIVATE_PREFIX)PROJECT_INCLUDES) \
- $(PRIVATE_HOST_C_INCLUDES)))) \
+ $(c-includes) \
-c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_HOST_GLOBAL_CFLAGS) \
@@ -1348,13 +1341,7 @@
###########################################################
define transform-host-c-or-s-to-o-common-args
- $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
- $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
- $(addprefix -isystem ,\
- $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
- $(filter-out $(PRIVATE_C_INCLUDES), \
- $($(PRIVATE_PREFIX)PROJECT_INCLUDES) \
- $(PRIVATE_HOST_C_INCLUDES)))) \
+ $(c-includes) \
-c \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_HOST_GLOBAL_CFLAGS) \