diff options
| author | Ying Wang <wangying@google.com> | 2015-02-13 10:28:40 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-03-16 10:56:03 -0700 |
| commit | f738b3bb9f48cef64e9520512d93b7bfd90ca137 (patch) | |
| tree | 6bd1e5de38d26635200bade4cf64dd78f8e16574 /core/main.mk | |
| parent | 18b27966a66a27da7b7199ab3e4351e9369cf060 (diff) | |
| download | build-f738b3bb9f48cef64e9520512d93b7bfd90ca137.zip build-f738b3bb9f48cef64e9520512d93b7bfd90ca137.tar.gz build-f738b3bb9f48cef64e9520512d93b7bfd90ca137.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
(cherry picked from commit bacf5f8008e4361d810895dd251354ac348cbf27)
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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 |