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/config.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/config.mk')
| -rw-r--r-- | core/config.mk | 2 |
1 files changed, 0 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. # ############################################################### |