StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 24Q3 (ab/11976889) to aosp-main-future

Browse Source 
Bug: 347831320
Merged-In: I64ddf6215ddfe33e180a54bf8a98092da8286808
Change-Id: I8bbab6af860d36134b3257eb1a9e4b0c9b567107
This commit is contained in:
Xin Li
2024-06-18 14:13:20 -07:00
parent e66ed453a2 89234715c4
commit 3956a39b9b
8 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aconfig/codegen/cc_aconfig_library.go
View File

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

3
aconfig/codegen/init.go
View File

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

2
aconfig/codegen/rust_aconfig_library.go
View File

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

41
android/api_levels.go
View File

@@ -444,26 +444,27 @@ func GetApiLevelsJson(ctx PathContext) WritablePath {
func getApiLevelsMapReleasedVersions() (map[string]int, error) { func getApiLevelsMapReleasedVersions() (map[string]int, error) {
return map[string]int{ return map[string]int{
"G": 9, "G": 9,
"I": 14, "I": 14,
"J": 16, "J": 16,
"J-MR1": 17, "J-MR1": 17,
"J-MR2": 18, "J-MR2": 18,
"K": 19, "K": 19,
"L": 21, "L": 21,
"L-MR1": 22, "L-MR1": 22,
"M": 23, "M": 23,
"N": 24, "N": 24,
"N-MR1": 25, "N-MR1": 25,
"O": 26, "O": 26,
"O-MR1": 27, "O-MR1": 27,
"P": 28, "P": 28,
"Q": 29, "Q": 29,
"R": 30, "R": 30,
"S": 31, "S": 31,
"S-V2": 32, "S-V2": 32,
"Tiramisu": 33, "Tiramisu": 33,
"UpsideDownCake": 34, "UpsideDownCake": 34,
"VanillaIceCream": 35,
}, nil }, nil
} }

5
android/config.go
View File

@@ -236,6 +236,11 @@ func (c Config) ReleaseHiddenApiExportableStubs() bool {
Bool(c.config.productVariables.HiddenapiExportableStubs) 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 // 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 // being built. For now there will only be one of these, but in the future there
// may be multiple devices being built. // may be multiple devices being built.

2
android/updatable_modules.go
View File

@@ -33,4 +33,4 @@ package android
// * AOSP - xx9990000 // * AOSP - xx9990000
// * x-mainline-prod - xx9990000 // * x-mainline-prod - xx9990000
// * master - 990090000 // * master - 990090000
const DefaultUpdatableModuleVersion = "350090000" const DefaultUpdatableModuleVersion = "352090000"

15
java/base.go
View File

@@ -94,9 +94,6 @@ type CommonProperties struct {
// if not blank, used as prefix to generate repackage rule // if not blank, used as prefix to generate repackage rule
Jarjar_prefix *string Jarjar_prefix *string
// if set to true, skip the jarjar repackaging
Skip_jarjar_repackage *bool
// If not blank, set the java version passed to javac as -source and -target // If not blank, set the java version passed to javac as -source and -target
Java_version *string Java_version *string
@@ -1112,13 +1109,11 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
jarjarProviderData := j.collectJarJarRules(ctx) jarjarProviderData := j.collectJarJarRules(ctx)
if jarjarProviderData != nil { if jarjarProviderData != nil {
android.SetProvider(ctx, JarJarProvider, *jarjarProviderData) android.SetProvider(ctx, JarJarProvider, *jarjarProviderData)
if !proptools.Bool(j.properties.Skip_jarjar_repackage) { text := getJarJarRuleText(jarjarProviderData)
text := getJarJarRuleText(jarjarProviderData) if text != "" {
if text != "" { ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt")
ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") android.WriteFileRule(ctx, ruleTextFile, text)
android.WriteFileRule(ctx, ruleTextFile, text) j.repackageJarjarRules = ruleTextFile
j.repackageJarjarRules = ruleTextFile
}
} }
} }

1
java/config/config.go
View File

@@ -51,6 +51,7 @@ var (
"core-icu4j", "core-icu4j",
"core-oj", "core-oj",
"core-libart", "core-libart",
"wear-sdk.impl",
} }
) )