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

Commit 530714ed authored Sep 05, 2024 by Xin Li

Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: If48f56757e069a467a8ae0466820f27f97b011a8
Change-Id: I63787ef5b57302a68518062ee2d5dcdbc7d4d8c4

parents b3251698 fc1cb97e

aconfig/codegen/cc_aconfig_library.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,7 @@ func (this *CcAconfigLibraryCallbacks) GeneratorBuildActions(ctx cc.ModuleContex
		Args: map[string]string{
		"gendir": this.generatedDir.String(),
		"mode": mode,
		"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorageCc()),
		"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),
		},
		})

aconfig/codegen/init.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,11 +64,12 @@ var (
		` && ${aconfig} create-rust-lib` +
		` --mode ${mode}` +
		` --cache ${in}` +
		` --allow-instrumentation ${debug}` +
		` --out ${gendir}`,
		CommandDeps: []string{
		"$aconfig",
		},
		}, "gendir", "mode")
		}, "gendir", "mode", "debug")
		)

		func init() {

aconfig/codegen/rust_aconfig_library.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ package codegen

		import (
		"fmt"
		"strconv"

		"android/soong/android"
		"android/soong/rust"
		@@ -82,6 +83,7 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path
		Args: map[string]string{
		"gendir": generatedDir.String(),
		"mode": mode,
		"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),
		},
		})
		a.BaseSourceProvider.OutputFiles = android.Paths{generatedSource}

android/api_levels.go

+21 −20

Original line number	Diff line number	Diff line
		@@ -464,6 +464,7 @@ func getApiLevelsMapReleasedVersions() (map[string]int, error) {
		"S-V2": 32,
		"Tiramisu": 33,
		"UpsideDownCake": 34,
		"VanillaIceCream": 35,
		}, nil
		}

android/config.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,11 @@ func (c Config) ReleaseHiddenApiExportableStubs() bool {
		Bool(c.config.productVariables.HiddenapiExportableStubs)
		}

		// Enable read flag from new storage
		func (c Config) ReleaseReadFromNewStorage() bool {
		return c.config.productVariables.GetBuildFlagBool("RELEASE_READ_FROM_NEW_STORAGE")
		}

		// A DeviceConfig object represents the configuration for a particular device
		// being built. For now there will only be one of these, but in the future there
		// may be multiple devices being built.