diff options
| author | Ying Wang <wangying@google.com> | 2015-03-16 18:57:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-16 18:57:37 +0000 |
| commit | d73696c1fefface6f3d2311d1dead3afae01b048 (patch) | |
| tree | 6bd1e5de38d26635200bade4cf64dd78f8e16574 | |
| parent | 18b27966a66a27da7b7199ab3e4351e9369cf060 (diff) | |
| parent | f738b3bb9f48cef64e9520512d93b7bfd90ca137 (diff) | |
| download | build-d73696c1fefface6f3d2311d1dead3afae01b048.zip build-d73696c1fefface6f3d2311d1dead3afae01b048.tar.gz build-d73696c1fefface6f3d2311d1dead3afae01b048.tar.bz2 | |
Merge "Load cts/build/config.mk after build/core/config.mk"
| -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 d6449d5..0b76b53 100644 --- a/core/config.mk +++ b/core/config.mk @@ -96,8 +96,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 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 |