diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-09-10 15:17:16 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 16:34:46 -0700 |
| commit | ddcab5edc045763098ca66fbb59236d6c15c3889 (patch) | |
| tree | c7239251b6a93ff12c9dfb5c9c845f507f1314b3 /core | |
| parent | f70c7e6a13b9e936989e5112146a82c1487aa1ba (diff) | |
| download | build-ddcab5edc045763098ca66fbb59236d6c15c3889.zip build-ddcab5edc045763098ca66fbb59236d6c15c3889.tar.gz build-ddcab5edc045763098ca66fbb59236d6c15c3889.tar.bz2 | |
build: Clean up use of vendor/extra
* extra_config.mk is not needed anymore
* Include BoardConfigExtra.mk if available
Change-Id: Icd0db0852ceee5cb5c701c9a40b829e1f3ebd69e
Diffstat (limited to 'core')
| -rw-r--r-- | core/config.mk | 1 | ||||
| -rw-r--r-- | core/dumpvar.mk | 4 | ||||
| -rw-r--r-- | core/main.mk | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index b13a88d..2eb09ec 100644 --- a/core/config.mk +++ b/core/config.mk @@ -161,6 +161,7 @@ include $(BUILD_SYSTEM)/envsetup.mk # See envsetup.mk for a description of SCAN_EXCLUDE_DIRS FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(OUT_DIR) $(SCAN_EXCLUDE_DIRS) .repo .git) +-include vendor/extra/BoardConfigExtra.mk # The build system exposes several variables for where to find the kernel # headers: # TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 1a6b120..47ba476 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -84,5 +84,9 @@ $(info HOST_OS_EXTRA=$(HOST_OS_EXTRA)) $(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE)) $(info BUILD_ID=$(BUILD_ID)) $(info OUT_DIR=$(OUT_DIR)) +ifeq ($(CYNGN_TARGET),true) +$(info CYNGN_TARGET=$(CYNGN_TARGET)) +$(info CYNGN_FEATURES=$(CYNGN_FEATURES)) +endif $(info ============================================) endif diff --git a/core/main.mk b/core/main.mk index 885cd56..9e51541 100644 --- a/core/main.mk +++ b/core/main.mk @@ -108,9 +108,6 @@ 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 |