diff --git a/android/build_prop.go b/android/build_prop.go
index d3ccecb66..ed3e9c81f 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() {
@@ -98,7 +94,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 92aae7e16..eff9fdd5b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2077,7 +2077,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 5356e8525..eb0e210c5 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -506,8 +506,6 @@ type ProductVariables struct {
 	OemProperties []string `json:",omitempty"`
 
 	ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
-
-	SystemPropFiles []string `json:",omitempty"`
 }
 
 type PartitionQualifiedVariablesType struct {