Load cts/build/config.mk after build/core/config.mk
So that the cts config.mk can use global variables set by the core build
system config.mk.
Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008e4361d810895dd251354ac348cbf27)
diff --git a/core/config.mk b/core/config.mk
index d6449d5..0b76b53 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -96,8 +96,6 @@
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk
--include cts/build/config.mk
-
# ###############################################################
# Parse out any modifier targets.
# ###############################################################
diff --git a/core/main.mk b/core/main.mk
index 4a2a626..0e058af 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -93,6 +93,9 @@
# and host information.
include $(BUILD_SYSTEM)/config.mk
+# CTS-specific config.
+-include cts/build/config.mk
+
# This allows us to force a clean build - included after the config.mk
# environment setup is done, but before we generate any dependencies. This
# file does the rm -rf inline so the deps which are all done below will