openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk" 

* commit 'd73696c1fefface6f3d2311d1dead3afae01b048':
  Load cts/build/config.mk after build/core/config.mk
This commit is contained in:
Ying Wang 2015-03-16 19:01:59 +00:00 committed by Android Git Automerger
parent 6502ae93e1 d73696c1fe
commit efc3a22009
2 changed files with 3 additions and 2 deletions
Show Stats 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
-include cts/build/config.mk
# ###############################################################
# Parse out any modifier targets.
# ###############################################################

3
core/main.mk
View File

@ -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