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

Commit 027f5024 authored by Inseob Kim's avatar Inseob Kim
Browse files

Revert "Add TARGET_SYSTEM_PROP to system build.prop" 

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
parent 0e7cde59

android/build_prop.go

+4 −9
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ type buildPropProperties struct { 
	// properties in prop_files.

	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

	// post_process_props without any further checking.

	Footer_files []string `android:"path"`
@@ -52,14 +56,6 @@ func (p *buildPropModule) stem() string { 
	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) {

	p.outputFilePath = PathForModuleOut(ctx, "build.prop").OutputPath

	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("--product-config=", PathForModuleSrc(ctx, proptools.String(p.properties.Product_config)))

	cmd.FlagWithArg("--partition=", partition)

	cmd.FlagForEachInput("--prop-files=", ctx.Config().SystemPropFiles(ctx))

	cmd.FlagWithOutput("--out=", p.outputFilePath)



	postProcessCmd := rule.Command().BuiltTool("post_process_props")

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -2135,7 +2135,3 @@ func (c *config) UseDebugArt() bool { 


	return Bool(c.productVariables.Eng)

}
 


func (c *config) SystemPropFiles(ctx PathContext) Paths {

	return PathsForSource(ctx, c.productVariables.SystemPropFiles)

}

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -522,8 +522,6 @@ type ProductVariables struct { 
	OemProperties []string `json:",omitempty"`



	ArtTargetIncludeDebugBuild *bool `json:",omitempty"`



	SystemPropFiles []string `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {