Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d0bae7 authored by Anton Hansson's avatar Anton Hansson
Browse files

Add base sdk extension version to the config 

So that it can be used by prebuilt_apis in follow-up CLs.

Bug: 220086085
Test: m nothing && inspect soong.variables
Change-Id: If987b8aef9802c52a751ea5351cab2a3df6f2e00
parent d1072724

android/config.go

+21 −12
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string 
			DeviceName:                          stringPtr("test_device"),

			Platform_sdk_version:                intPtr(30),

			Platform_sdk_codename:               stringPtr("S"),

			Platform_base_sdk_extension_version: intPtr(1),

			Platform_version_active_codenames:   []string{"S", "Tiramisu"},

			DeviceSystemSdkVersions:             []string{"14", "15"},

			Platform_systemsdk_versions:         []string{"29", "30"},
@@ -742,6 +743,14 @@ func (c *config) PlatformSdkCodename() string { 
	return String(c.productVariables.Platform_sdk_codename)

}



func (c *config) PlatformSdkExtensionVersion() int {

	return *c.productVariables.Platform_sdk_extension_version

}



func (c *config) PlatformBaseSdkExtensionVersion() int {

	return *c.productVariables.Platform_base_sdk_extension_version

}



func (c *config) PlatformSecurityPatch() string {

	return String(c.productVariables.Platform_security_patch)

}

android/variable.go

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ type productVariables struct { 
	Platform_sdk_version_or_codename          *string  `json:",omitempty"`

	Platform_sdk_final                        *bool    `json:",omitempty"`

	Platform_sdk_extension_version            *int     `json:",omitempty"`

	Platform_base_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"`