aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-03-08 17:16:57 -0800
committerJean-Baptiste Queru <jbq@google.com>2010-09-10 14:29:50 -0700
commit1e80c294ffef26a6a7fe435411cd7557003b1d3f (patch)
treef07a02fa20e35acd32c92c522d6c0e82f2bb66a2
parentcc84526bcef5ffd7ed9abf73dc3bfc9e29784b22 (diff)
downloadbuild-1e80c294ffef26a6a7fe435411cd7557003b1d3f.tar.gz
[build] move dumpvar.mk include after select.mk include
because the dumpvar target was included early in envsetup.mk, it was not possible to use it to dump variables that were defined by makefiles included later (like the toolchain variables in combo/select.mk). move dumpvar.mk to after select.mk and javac.mk, so that shell functions can be created using the toolchain build variables Change-Id: I1c22025a8981fa91c183846fb28be26fb562adfb Signed-off-by: Gary King <gking@nvidia.com>
-rw-r--r--core/config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk
index 0a306e13a1..61cd0c68f4 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -144,8 +144,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))
@@ -341,3 +339,5 @@ TARGET_AVAILABLE_SDK_VERSIONS := current $(call numerically_sort,\
$(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android.jar)))
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
+
+include $(BUILD_SYSTEM)/dumpvar.mk