summaryrefslogtreecommitdiffstats
path: root/core/main.mk
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2014-05-18 15:34:30 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:33:24 -0700
commit8420a66a262762ebc1256c6fa630c17e50f63fe4 (patch)
treef39d2dd25bbbae9a04f9fde14113f67a35b840bb /core/main.mk
parent2e9807b7e3d6e261a8e0044348db6dbbb3773cb8 (diff)
downloadbuild-8420a66a262762ebc1256c6fa630c17e50f63fe4.zip
build-8420a66a262762ebc1256c6fa630c17e50f63fe4.tar.gz
build-8420a66a262762ebc1256c6fa630c17e50f63fe4.tar.bz2
build: Include an extra device.mk
Change-Id: I4373f78f57c81e46affc2f6a6bc854bf4c3d00db
Diffstat (limited to 'core/main.mk')
-rw-r--r--core/main.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/core/main.mk b/core/main.mk
index f67362e..885cd56 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -102,10 +102,17 @@ include $(BUILD_SYSTEM)/config.mk
# be generated correctly
include $(BUILD_SYSTEM)/cleanbuild.mk
+# Bring in Qualcomm helper macros
+include $(BUILD_SYSTEM)/qcom_utils.mk
+
# Include the google-specific config
-include vendor/google/build/config.mk
+# Include the extra device config
+-include vendor/extra/device.mk
+
VERSION_CHECK_SEQUENCE_NUMBER := 5
+
-include $(OUT_DIR)/versions_checked.mk
ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -244,9 +251,6 @@ endif
# Bring in standard build system definitions.
include $(BUILD_SYSTEM)/definitions.mk
-# Bring in Qualcomm helper macros
-include $(BUILD_SYSTEM)/qcom_utils.mk
-
# Bring in dex_preopt.mk
include $(BUILD_SYSTEM)/dex_preopt.mk