commit 7fce53dfcbb86b9f924a85c16006569dd7e4e816
author Colin Cross <ccross@android.com> Wed Apr 18 15:35:06 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 18 15:35:06 2018 -0700
tree 3e8bd24a75dd60a5c4189c13be6a6d476639fb29
parent bf46541b73a8e70e2ff2493504acf72fa9a4ebe0
parent 733057f12f987576d42ea8b6bdaab5c0a4a23ad2

Merge "Pass PLATFORM_VERSION_CODENAME to Soong" am: 7c84a01daf
am: 733057f12f

Change-Id: Idd0a1b706c992949d9425b016799b133150f836f

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 8cf5b54..da50778 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -46,6 +46,8 @@
 $(call add_json_str,  BuildNumberFromFile,               $$$(BUILD_NUMBER_FROM_FILE))
 
 $(call add_json_val,  Platform_sdk_version,              $(PLATFORM_SDK_VERSION))
+$(call add_json_str,  Platform_sdk_codename,             $(PLATFORM_VERSION_CODENAME))
+$(call add_json_bool, Platform_sdk_final,                $(filter REL,$(PLATFORM_VERSION_CODENAME)))
 $(call add_json_csv,  Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))
 $(call add_json_csv,  Platform_version_future_codenames, $(PLATFORM_VERSION_FUTURE_CODENAMES))