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

Revert "Add TARGET_SYSTEM_PROP to system build.prop"

Browse Source 
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: Ic089dc3dfcbf2083d1bcf2413be432dcb61ce525
This commit is contained in:
Inseob Kim
2024-07-25 02:45:53 +00:00
parent 0e7cde59c8
commit 027f50246f
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/build_prop.go
View File

@@ -31,6 +31,10 @@ type buildPropProperties struct {
// properties in prop_files. // properties in prop_files.
Block_list []string Block_list []string
// Path to the input prop files. The contents of the files are directly
// emitted to the output
Prop_files []string `android:"path"`
// Files to be appended at the end of build.prop. These files are appended after // Files to be appended at the end of build.prop. These files are appended after
// post_process_props without any further checking. // post_process_props without any further checking.
Footer_files []string `android:"path"` Footer_files []string `android:"path"`
@@ -52,14 +56,6 @@ func (p *buildPropModule) stem() string {
return proptools.StringDefault(p.properties.Stem, "build.prop") return proptools.StringDefault(p.properties.Stem, "build.prop")
} }
func (p *buildPropModule) propFiles(ctx ModuleContext) Paths {
partition := p.PartitionTag(ctx.DeviceConfig())
if partition == "system" {
return ctx.Config().SystemPropFiles(ctx)
}
return nil
}
func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) { func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
p.outputFilePath = PathForModuleOut(ctx, "build.prop").OutputPath p.outputFilePath = PathForModuleOut(ctx, "build.prop").OutputPath
if !ctx.Config().KatiEnabled() { if !ctx.Config().KatiEnabled() {
@@ -97,7 +93,6 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
cmd.FlagWithInput("--platform-preview-sdk-fingerprint-file=", ApiFingerprintPath(ctx)) cmd.FlagWithInput("--platform-preview-sdk-fingerprint-file=", ApiFingerprintPath(ctx))
cmd.FlagWithInput("--product-config=", PathForModuleSrc(ctx, proptools.String(p.properties.Product_config))) cmd.FlagWithInput("--product-config=", PathForModuleSrc(ctx, proptools.String(p.properties.Product_config)))
cmd.FlagWithArg("--partition=", partition) cmd.FlagWithArg("--partition=", partition)
cmd.FlagForEachInput("--prop-files=", ctx.Config().SystemPropFiles(ctx))
cmd.FlagWithOutput("--out=", p.outputFilePath) cmd.FlagWithOutput("--out=", p.outputFilePath)
postProcessCmd := rule.Command().BuiltTool("post_process_props") postProcessCmd := rule.Command().BuiltTool("post_process_props")

4
android/config.go
View File

@@ -2135,7 +2135,3 @@ func (c *config) UseDebugArt() bool {
return Bool(c.productVariables.Eng) return Bool(c.productVariables.Eng)
} }
func (c *config) SystemPropFiles(ctx PathContext) Paths {
return PathsForSource(ctx, c.productVariables.SystemPropFiles)
}

2
android/variable.go
View File

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