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

Commit e5fce6cd authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES"

parents 0b14d0f5 03302eee

android/api_levels.go

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ func getApiLevelsMap(config Config) map[string]int { 
			"P":     28,

			"Q":     29,

		}

		for i, codename := range config.PlatformVersionCombinedCodenames() {

		for i, codename := range config.PlatformVersionActiveCodenames() {

			apiLevelsMap[codename] = baseApiLevel + i

		}

android/config.go

+0 −16
Original line number Diff line number Diff line
@@ -652,22 +652,6 @@ func (c *config) PlatformVersionActiveCodenames() []string { 
	return c.productVariables.Platform_version_active_codenames

}



// Codenames that are available in the branch but not included in the current

// lunch target.

func (c *config) PlatformVersionFutureCodenames() []string {

	return c.productVariables.Platform_version_future_codenames

}



// All possible codenames in the current branch. NB: Not named AllCodenames

// because "all" has historically meant "active" in make, and still does in

// build.prop.

func (c *config) PlatformVersionCombinedCodenames() []string {

	combined := []string{}

	combined = append(combined, c.PlatformVersionActiveCodenames()...)

	combined = append(combined, c.PlatformVersionFutureCodenames()...)

	return combined

}



func (c *config) ProductAAPTConfig() []string {

	return c.productVariables.AAPTConfig

}

android/variable.go

+1 −3
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ type productVariables struct { 
	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"`
@@ -358,7 +357,6 @@ func (v *productVariables) SetDefaultConfig() { 
		Platform_sdk_codename:             stringPtr("Q"),

		Platform_sdk_final:                boolPtr(false),

		Platform_version_active_codenames: []string{"Q"},

		Platform_version_future_codenames: []string{"Q"},

		Platform_vndk_version:             stringPtr("Q"),



		HostArch:                   stringPtr("x86_64"),

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ func (ctx *moduleContextImpl) sdkVersion() string { 
	if ctx.ctx.Device() {

		if ctx.useVndk() {

			vndkVer := ctx.mod.VndkVersion()

			if inList(vndkVer, ctx.ctx.Config().PlatformVersionCombinedCodenames()) {

			if inList(vndkVer, ctx.ctx.Config().PlatformVersionActiveCodenames()) {

				return "current"

			}

			return vndkVer

cc/llndk_library.go

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ func (stub *llndkStubDecorator) compilerFlags(ctx ModuleContext, flags Flags, de 


func (stub *llndkStubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {

	vndkVer := ctx.Module().(*Module).VndkVersion()

	if !inList(vndkVer, ctx.Config().PlatformVersionCombinedCodenames()) || vndkVer == "" {

	if !inList(vndkVer, ctx.Config().PlatformVersionActiveCodenames()) || vndkVer == "" {

		// For non-enforcing devices, vndkVer is empty. Use "current" in that case, too.

		vndkVer = "current"

	}