From b021bf8c5acaddc073300ab7d3ed279e5d045d9e Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 27 Aug 2021 17:35:40 +0100 Subject: [PATCH] Add support for extension version in variables This makes the sdk extension version usable in genrule cmds via %d. Bug: 195281582 Test: current_sdkinfo module in packages/modules/common. Change-Id: I82a90b83d23b0ba3779a943c2ad444bf5cf937da Merged-In: I82a90b83d23b0ba3779a943c2ad444bf5cf937da (cherry picked from commit e720c41f67a7e9309f1e6e48d5975383be7b2d28) --- android/variable.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/variable.go b/android/variable.go index a0dbb3d9c..03847a129 100644 --- a/android/variable.go +++ b/android/variable.go @@ -46,6 +46,10 @@ type variableProperties struct { Java_resource_dirs []string } + Platform_sdk_extension_version struct { + Cmd *string + } + // unbundled_build is a catch-all property to annotate modules that don't build in one or // more unbundled branches, usually due to dependencies missing from the manifest. Unbundled_build struct { @@ -173,6 +177,7 @@ type productVariables struct { Platform_sdk_codename *string `json:",omitempty"` Platform_sdk_version_or_codename *string `json:",omitempty"` Platform_sdk_final *bool `json:",omitempty"` + Platform_sdk_extension_version *int `json:",omitempty"` Platform_version_active_codenames []string `json:",omitempty"` Platform_vndk_version *string `json:",omitempty"` Platform_systemsdk_versions []string `json:",omitempty"`