Print the platform version and version codename in the big build header.
diff --git a/core/envsetup.mk b/core/envsetup.mk
index ba93549..31901e9 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -7,6 +7,9 @@
# OUT_DIR is also set to "out" if it's not already set.
# this allows you to set it to somewhere else if you like
+# Set up version information.
+include $(BUILD_SYSTEM)/version_defaults.mk
+
# ---------------------------------------------------------------
# If you update the build system such that the environment setup
# or buildspec.mk need to be updated, increment this number, and
@@ -319,6 +322,8 @@
ifneq ($(PRINT_BUILD_CONFIG),)
$(info ============================================)
+$(info PLATFORM_VERSION_CODENAME=$(PLATFORM_VERSION_CODENAME))
+$(info PLATFORM_VERSION=$(PLATFORM_VERSION))
$(info TARGET_PRODUCT=$(TARGET_PRODUCT))
$(info TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT))
$(info TARGET_SIMULATOR=$(TARGET_SIMULATOR))
diff --git a/core/main.mk b/core/main.mk
index ebd2b9d..655a592 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -85,9 +85,6 @@
$(error Directory names containing spaces not supported)
endif
-# Set up version information.
-include $(BUILD_SYSTEM)/version_defaults.mk
-
# These are the modifier targets that don't do anything themselves, but
# change the behavior of the build.
# (must be defined before including definitions.make)