Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e25fd793 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 458c0cd3

core/binary.mk

+8 −9
Original line number Diff line number Diff line
@@ -337,12 +337,11 @@ my_asflags += -D__ASSEMBLY__ 
###########################################################

ifndef LOCAL_IS_HOST_MODULE

ifdef LOCAL_SDK_VERSION

my_target_project_includes :=

my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_sysroot_include)

my_target_global_c_includes := $(my_ndk_stl_include_path) $(my_ndk_sysroot_include)

my_target_global_cppflags := $(my_ndk_stl_cppflags)

else

my_target_project_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES)

my_target_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_C_INCLUDES)

my_target_global_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_C_INCLUDES)

my_target_global_cppflags :=

endif # LOCAL_SDK_VERSION
@@ -358,8 +357,7 @@ my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CPPFLAG 
my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)

endif # my_clang



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_INCLUDES := $(my_target_global_c_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CONLYFLAGS := $(my_target_global_conlyflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)
@@ -367,21 +365,22 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_glob 


else # LOCAL_IS_HOST_MODULE



my_host_global_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)



ifeq ($(my_clang),true)

my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS)

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)

my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

else

my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CFLAGS)

my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CONLYFLAGS)

my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CPPFLAGS)

my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_LDFLAGS)

my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

endif # my_clang



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_C_INCLUDES := $(my_host_c_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_INCLUDES := $(my_host_global_c_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_CFLAGS := $(my_host_global_cflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_CONLYFLAGS := $(my_host_global_conlyflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_CPPFLAGS := $(my_host_global_cppflags)

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ HOST_CROSS_PROJECT_INCLUDES:= $(SRC_HEADERS) $(HOST_CROSS_OUT_HEADERS) 


ifdef HOST_CROSS_2ND_ARCH

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_GLOBAL_LD_DIRS := -L$($(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES)

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_INCLUDES:= $(SRC_HEADERS) $($(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_HEADERS)

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_INCLUDES:= $(HOST_CROSS_PROJECT_INCLUDES)

endif

endif

core/definitions.mk

+15 −28
Original line number Diff line number Diff line
@@ -1149,19 +1149,24 @@ $(hide) $(DBUS_GENERATOR) \ 
	$(filter %.dbus-xml,$^)

endef





###########################################################

## Commands for running gcc to compile a C++ file

## Helper to set include paths form transform-*-to-o

###########################################################



define transform-cpp-to-o-compiler-args

define c-includes

$(addprefix -I , $(PRIVATE_C_INCLUDES)) \

$$(cat $(PRIVATE_IMPORT_INCLUDES))\

	$(addprefix -isystem ,\

$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),,\

    $(addprefix -isystem ,\

        $(filter-out $(PRIVATE_C_INCLUDES), \

	            $(PRIVATE_TARGET_PROJECT_INCLUDES) \

	            $(PRIVATE_TARGET_C_INCLUDES)))) \

            $(PRIVATE_GLOBAL_C_INCLUDES))))

endef



###########################################################

## Commands for running gcc to compile a C++ file

###########################################################



define transform-cpp-to-o-compiler-args

	$(c-includes) \

	-c \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

	    $(PRIVATE_TARGET_GLOBAL_CFLAGS) \
@@ -1207,13 +1212,7 @@ endif 


# $(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 @@ endef 
###########################################################



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 @@ endif 
###########################################################



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) \