StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load cts/build/config.mk after build/core/config.mk

Browse Source 
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 bacf5f8008)
This commit is contained in:
Ying Wang
2015-02-13 10:28:40 -08:00
parent 18b27966a6
commit f738b3bb9f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -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 BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk
-include cts/build/config.mk
# ############################################################### # ###############################################################
# Parse out any modifier targets. # Parse out any modifier targets.
# ############################################################### # ###############################################################

3
core/main.mk
View File

@@ -93,6 +93,9 @@ include $(BUILD_SYSTEM)/help.mk
# and host information. # and host information.
include $(BUILD_SYSTEM)/config.mk 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 # This allows us to force a clean build - included after the config.mk
# environment setup is done, but before we generate any dependencies. This # 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 # file does the rm -rf inline so the deps which are all done below will