From 027f50246f782de9c4b8cd22f88d736d8ab8cf79 Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Thu, 25 Jul 2024 02:45:53 +0000
Subject: [PATCH] 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
---
 android/build_prop.go | 13 ++++---------
 android/config.go     |  4 ----
 android/variable.go   |  2 --
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/android/build_prop.go b/android/build_prop.go
index a925273ea..45c17c35b 100644
--- a/android/build_prop.go
+++ b/android/build_prop.go
@@ -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")
diff --git a/android/config.go b/android/config.go
index f1f1e9c8f..0e3b0a1ef 100644
--- a/android/config.go
+++ b/android/config.go
@@ -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)
-}
diff --git a/android/variable.go b/android/variable.go
index ec4d0ea74..b2173ec37 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -522,8 +522,6 @@ type ProductVariables struct {
 	OemProperties []string `json:",omitempty"`
 
 	ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
-
-	SystemPropFiles []string `json:",omitempty"`
 }
 
 type PartitionQualifiedVariablesType struct {