diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-12 17:24:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-12 17:24:18 +0000 |
| commit | 5e037c38d3ce8f9bba5b5cea927c0058ba467c61 (patch) | |
| tree | 3d6e423171c5d9bfd2a3dd8182d64fcdcdecf999 /android | |
| parent | 353222b81da2fcd82b25c14344b9d1373f54b6b9 (diff) | |
| parent | 8e84648a637c69db354217ecad319190a6bb4ad5 (diff) | |
| download | build_soong-5e037c38d3ce8f9bba5b5cea927c0058ba467c61.tar.gz build_soong-5e037c38d3ce8f9bba5b5cea927c0058ba467c61.tar.bz2 build_soong-5e037c38d3ce8f9bba5b5cea927c0058ba467c61.zip | |
Merge "Export more config variables" into qt-dev
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 16 | ||||
| -rw-r--r-- | android/variable.go | 20 |
2 files changed, 28 insertions, 8 deletions
diff --git a/android/config.go b/android/config.go index 705b1e1d..b938cb06 100644 --- a/android/config.go +++ b/android/config.go @@ -501,6 +501,22 @@ func (c *config) PlatformSdkCodename() string { return String(c.productVariables.Platform_sdk_codename) } +func (c *config) PlatformSecurityPatch() string { + return String(c.productVariables.Platform_security_patch) +} + +func (c *config) PlatformPreviewSdkVersion() string { + return String(c.productVariables.Platform_preview_sdk_version) +} + +func (c *config) PlatformMinSupportedTargetSdkVersion() string { + return String(c.productVariables.Platform_min_supported_target_sdk_version) +} + +func (c *config) PlatformBaseOS() string { + return String(c.productVariables.Platform_base_os) +} + func (c *config) MinSupportedSdkVersion() int { return 16 } diff --git a/android/variable.go b/android/variable.go index 7daa9263..c514ce7a 100644 --- a/android/variable.go +++ b/android/variable.go @@ -137,14 +137,18 @@ type productVariables struct { BuildNumberFromFile *string `json:",omitempty"` DateFromFile *string `json:",omitempty"` - Platform_version_name *string `json:",omitempty"` - Platform_sdk_version *int `json:",omitempty"` - Platform_sdk_codename *string `json:",omitempty"` - Platform_sdk_final *bool `json:",omitempty"` - Platform_version_active_codenames []string `json:",omitempty"` - Platform_version_future_codenames []string `json:",omitempty"` - Platform_vndk_version *string `json:",omitempty"` - Platform_systemsdk_versions []string `json:",omitempty"` + Platform_version_name *string `json:",omitempty"` + Platform_sdk_version *int `json:",omitempty"` + Platform_sdk_codename *string `json:",omitempty"` + Platform_sdk_final *bool `json:",omitempty"` + Platform_version_active_codenames []string `json:",omitempty"` + Platform_version_future_codenames []string `json:",omitempty"` + Platform_vndk_version *string `json:",omitempty"` + Platform_systemsdk_versions []string `json:",omitempty"` + Platform_security_patch *string `json:",omitempty"` + Platform_preview_sdk_version *string `json:",omitempty"` + Platform_min_supported_target_sdk_version *string `json:",omitempty"` + Platform_base_os *string `json:",omitempty"` DeviceName *string `json:",omitempty"` DeviceArch *string `json:",omitempty"` |