diff options
| author | Gary King <gking@nvidia.com> | 2010-09-10 15:42:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 15:42:30 -0700 |
| commit | 1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1 (patch) | |
| tree | 7d7f5b042b2e97fcdfd23ada34b9e72a0d4fa0d1 /core/config.mk | |
| parent | bcd1e1c8580213838b8ba415168065291019dcd4 (diff) | |
| parent | 1e80c294ffef26a6a7fe435411cd7557003b1d3f (diff) | |
| download | build-1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1.zip build-1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1.tar.gz build-1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1.tar.bz2 | |
am 1e80c294: [build] move dumpvar.mk include after select.mk include
Merge commit '1e80c294ffef26a6a7fe435411cd7557003b1d3f' into gingerbread-plus-aosp
* commit '1e80c294ffef26a6a7fe435411cd7557003b1d3f':
[build] move dumpvar.mk include after select.mk include
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index db2ea51..24380d4 100644 --- a/core/config.mk +++ b/core/config.mk @@ -145,8 +145,6 @@ include $(board_config_mk) TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk))) board_config_mk := -include $(BUILD_SYSTEM)/dumpvar.mk - # Clean up/verify variables defined by the board config file. TARGET_BOOTLOADER_BOARD_NAME := $(strip $(TARGET_BOOTLOADER_BOARD_NAME)) TARGET_CPU_ABI := $(strip $(TARGET_CPU_ABI)) @@ -349,3 +347,5 @@ TARGET_AVAILABLE_NDK_VERSIONS := $(call numerically_sort,\ $(wildcard $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r*))) INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml + +include $(BUILD_SYSTEM)/dumpvar.mk |