From c051048ba7db95749c34c488448c2c79a8c3fe26 Mon Sep 17 00:00:00 2001 From: Colin Cross <ccross@android.com> Date: Wed, 18 Apr 2018 12:40:16 -0700 Subject: [PATCH] Pass PLATFORM_VERSION_CODENAME to Soong Pass PLATFORM_VERSION_CODENAME as Platform_sdk_codename, and set Platform_sdk_final if PLATFORM_VERSION_CODENAME is REL. Bug: 78224641 Test: m checkbuild Change-Id: Ic082ca756d877ba51f45e89aa2ac267781a8d854 Merged-In: Ic082ca756d877ba51f45e89aa2ac267781a8d854 (cherry picked from commit f6d3fff907d9249e9c6bedb5eedf3a4dfe4e3959) --- core/soong_config.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index 97a5dce06..0b9951402 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -46,6 +46,8 @@ $(call add_json_str, BuildId, $(BUILD_ID)) $(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))