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

Revert^2 "Conditionally pass kernel version to build.prop" am: 6bd92d5924

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199371

Change-Id: I47dd45bd74c11e604b17ee195f95a6e2575a23b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim
2024-08-01 00:05:16 +00:00
committed by Automerger Merge Worker
parent 6fb79d21f5 6bd92d5924
commit db166effa0
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/build_prop.go
View File

@@ -106,7 +106,12 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
postProcessCmd.Flag("--allow-dup") postProcessCmd.Flag("--allow-dup")
} }
postProcessCmd.FlagWithArg("--sdk-version ", config.PlatformSdkVersion().String()) postProcessCmd.FlagWithArg("--sdk-version ", config.PlatformSdkVersion().String())
if ctx.Config().EnableUffdGc() == "default" {
postProcessCmd.FlagWithInput("--kernel-version-file-for-uffd-gc ", PathForOutput(ctx, "dexpreopt/kernel_version_for_uffd_gc.txt")) postProcessCmd.FlagWithInput("--kernel-version-file-for-uffd-gc ", PathForOutput(ctx, "dexpreopt/kernel_version_for_uffd_gc.txt"))
} else {
// still need to pass an empty string to kernel-version-file-for-uffd-gc
postProcessCmd.FlagWithArg("--kernel-version-file-for-uffd-gc ", `""`)
}
postProcessCmd.Text(p.outputFilePath.String()) postProcessCmd.Text(p.outputFilePath.String())
postProcessCmd.Flags(p.properties.Block_list) postProcessCmd.Flags(p.properties.Block_list)

4
android/config.go
View File

@@ -2090,3 +2090,7 @@ func (c *config) UseDebugArt() bool {
func (c *config) SystemPropFiles(ctx PathContext) Paths { func (c *config) SystemPropFiles(ctx PathContext) Paths {
return PathsForSource(ctx, c.productVariables.SystemPropFiles) return PathsForSource(ctx, c.productVariables.SystemPropFiles)
} }
func (c *config) EnableUffdGc() string {
return String(c.productVariables.EnableUffdGc)
}

2
android/variable.go
View File

@@ -509,6 +509,8 @@ type ProductVariables struct {
ArtTargetIncludeDebugBuild *bool `json:",omitempty"` ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
SystemPropFiles []string `json:",omitempty"` SystemPropFiles []string `json:",omitempty"`
EnableUffdGc *string `json:",omitempty"`
} }
type PartitionQualifiedVariablesType struct { type PartitionQualifiedVariablesType struct {