diff options
| author | 2021-08-09 15:44:44 -0700 | |
|---|---|---|
| committer | 2021-08-11 12:33:37 -0700 | |
| commit | 402e9b08e1331fec2da05daf14f0badd2014e36f (patch) | |
| tree | 061ecaef83ed7819a92c4a2268b3334fc749fffe /android/variable.go | |
| parent | 0bcba80823b07b5e12f655fde6f9c019d1a0d03d (diff) | |
Add Platform_sdk_version_or_codename variable
1. Added a new product variable Platform_sdk_version_or_codename;
2. This variable is used to support the logic in the Android.bp file
when either the Platform_sdk_version or the Platform_sdk_codename is
used.
Bug: 195986342
Test: m CtsThemeHostTestCases (the module where the product variable is
used)
Test: TreeHugger
Change-Id: I6b952ce47fd4adc280aa3c7ef4185487558af9bc
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android/variable.go b/android/variable.go index 0fb907810..5cf9aa8e8 100644 --- a/android/variable.go +++ b/android/variable.go @@ -42,6 +42,10 @@ type variableProperties struct { Cflags []string } + Platform_sdk_version_or_codename struct { + Java_resource_dirs []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 { @@ -164,6 +168,7 @@ type productVariables struct { Platform_version_name *string `json:",omitempty"` Platform_sdk_version *int `json:",omitempty"` Platform_sdk_codename *string `json:",omitempty"` + Platform_sdk_version_or_codename *string `json:",omitempty"` Platform_sdk_final *bool `json:",omitempty"` Platform_version_active_codenames []string `json:",omitempty"` Platform_vndk_version *string `json:",omitempty"` |