From 9a22c7e61bf16c038397628c957f3a517c370c39 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 26 Aug 2024 15:58:09 +0900 Subject: [PATCH] Include TARGET_ODM_PROP to odm/etc/build.prop It's missing in Soong's build_prop module. Bug: 322090587 Bug: 361623560 Test: set TARGET_ODM_PROP and see odm/etc/build.prop Change-Id: I447a64998f6ae0ba80201ab4ab6c0fd0ef22e3e5 --- android/build_prop.go | 2 ++ android/config.go | 4 ++++ android/variable.go | 1 + 3 files changed, 7 insertions(+) diff --git a/android/build_prop.go b/android/build_prop.go index 13d59f9f5..ede93ed20 100644 --- a/android/build_prop.go +++ b/android/build_prop.go @@ -63,6 +63,8 @@ func (p *buildPropModule) propFiles(ctx ModuleContext) Paths { return ctx.Config().SystemExtPropFiles(ctx) } else if partition == "product" { return ctx.Config().ProductPropFiles(ctx) + } else if partition == "odm" { + return ctx.Config().OdmPropFiles(ctx) } return nil } diff --git a/android/config.go b/android/config.go index 77c5b341d..fc397f4c7 100644 --- a/android/config.go +++ b/android/config.go @@ -2057,6 +2057,10 @@ func (c *config) ProductPropFiles(ctx PathContext) Paths { return PathsForSource(ctx, c.productVariables.ProductPropFiles) } +func (c *config) OdmPropFiles(ctx PathContext) Paths { + return PathsForSource(ctx, c.productVariables.OdmPropFiles) +} + func (c *config) EnableUffdGc() string { return String(c.productVariables.EnableUffdGc) } diff --git a/android/variable.go b/android/variable.go index c8744ed6a..9026f9348 100644 --- a/android/variable.go +++ b/android/variable.go @@ -512,6 +512,7 @@ type ProductVariables struct { SystemPropFiles []string `json:",omitempty"` SystemExtPropFiles []string `json:",omitempty"` ProductPropFiles []string `json:",omitempty"` + OdmPropFiles []string `json:",omitempty"` EnableUffdGc *string `json:",omitempty"`