diff options
author | Ying Wang <wangying@google.com> | 2015-02-13 10:28:40 -0800 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2015-02-13 10:28:40 -0800 |
commit | bacf5f8008e4361d810895dd251354ac348cbf27 (patch) | |
tree | d8ff741453e24c0ffc886cab457dbce26463b2ee /core | |
parent | 4d88a3639b6a76763de3be6dcc18582bdb873188 (diff) | |
download | build-bacf5f8008e4361d810895dd251354ac348cbf27.zip build-bacf5f8008e4361d810895dd251354ac348cbf27.tar.gz build-bacf5f8008e4361d810895dd251354ac348cbf27.tar.bz2 |
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
Diffstat (limited to 'core')
-rw-r--r-- | core/config.mk | 2 | ||||
-rw-r--r-- | core/main.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index 475cba7..61a198a 100644 --- a/core/config.mk +++ b/core/config.mk @@ -95,8 +95,6 @@ BUILD_HOST_DALVIK_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_java_library.mk 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 d23c762..2c15d0f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -93,6 +93,9 @@ include $(BUILD_SYSTEM)/help.mk # 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 |