From: Steve Kondik Date: Sun, 18 May 2014 22:34:30 +0000 (-0700) Subject: build: Include an extra device.mk X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de0f5efe46804146990cba53dd0e2ce531d03cae;p=android-x86%2Fbuild.git build: Include an extra device.mk Change-Id: I4373f78f57c81e46affc2f6a6bc854bf4c3d00db build: Clean up use of vendor/extra * extra_config.mk is not needed anymore * Include BoardConfigExtra.mk if available Change-Id: Icd0db0852ceee5cb5c701c9a40b829e1f3ebd69e --- diff --git a/core/config.mk b/core/config.mk index fb61d2483..d2d4f7116 100644 --- a/core/config.mk +++ b/core/config.mk @@ -167,6 +167,8 @@ 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 9b0b27a37..2716f656d 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -25,6 +25,12 @@ print_build_config_vars := \ BUILD_ID \ OUT_DIR +ifeq ($(CYNGN_TARGET),true) +print_build_config_vars += \ + CYNGN_TARGET \ + CYNGN_FEATURES +endif + ifeq ($(TARGET_BUILD_PDK),true) print_build_config_vars += \ TARGET_BUILD_PDK \ diff --git a/core/main.mk b/core/main.mk index 1be407832..a6893561b 100644 --- a/core/main.mk +++ b/core/main.mk @@ -141,6 +141,9 @@ endif # 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 @@ -294,9 +297,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