Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2219b1d8 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit 'efc3a220':
  Load cts/build/config.mk after build/core/config.mk
parents 22311914 efc3a220

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -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.

# ###############################################################

core/main.mk

+3 −0
Original line number Diff line number Diff line
@@ -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