diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 5 | ||||
| -rw-r--r-- | android/variable.go | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/android/config.go b/android/config.go index 13e55bc19..dd622e5b2 100644 --- a/android/config.go +++ b/android/config.go @@ -35,6 +35,7 @@ import ( var Bool = proptools.Bool var String = proptools.String +var StringDefault = proptools.StringDefault const FutureApiLevel = 10000 @@ -958,6 +959,10 @@ func (c *deviceConfig) VndkVersion() string { return String(c.config.productVariables.DeviceVndkVersion) } +func (c *deviceConfig) CurrentApiLevelForVendorModules() string { + return StringDefault(c.config.productVariables.DeviceCurrentApiLevelForVendorModules, "current") +} + func (c *deviceConfig) PlatformVndkVersion() string { return String(c.config.productVariables.Platform_vndk_version) } diff --git a/android/variable.go b/android/variable.go index 1f21f3498..53f081e8c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -166,13 +166,14 @@ type productVariables struct { Platform_min_supported_target_sdk_version *string `json:",omitempty"` Platform_base_os *string `json:",omitempty"` - DeviceName *string `json:",omitempty"` - DeviceArch *string `json:",omitempty"` - DeviceArchVariant *string `json:",omitempty"` - DeviceCpuVariant *string `json:",omitempty"` - DeviceAbi []string `json:",omitempty"` - DeviceVndkVersion *string `json:",omitempty"` - DeviceSystemSdkVersions []string `json:",omitempty"` + DeviceName *string `json:",omitempty"` + DeviceArch *string `json:",omitempty"` + DeviceArchVariant *string `json:",omitempty"` + DeviceCpuVariant *string `json:",omitempty"` + DeviceAbi []string `json:",omitempty"` + DeviceVndkVersion *string `json:",omitempty"` + DeviceCurrentApiLevelForVendorModules *string `json:",omitempty"` + DeviceSystemSdkVersions []string `json:",omitempty"` DeviceSecondaryArch *string `json:",omitempty"` DeviceSecondaryArchVariant *string `json:",omitempty"` |