[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>

diff --git a/core/config.mk b/core/config.mk
index 59ce8dc..ea2da05 100644 (file)
--- 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))
@@ -357,3 +355,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