commit e25fd79337b5a4ed73d3f3ac7dfd8bb63a698570
author Colin Cross <ccross@android.com> Tue Jul 19 13:19:21 2016 -0700
committer Colin Cross <ccross@android.com> Tue Jul 19 15:09:50 2016 -0700
tree 87666271f86254d35c994c251d768bcd8d6adaee
parent 458c0cd37b665f9c89718a6c9de22b3f85e7209c

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

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index b179881..d497dbb 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -684,7 +684,7 @@
 
 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