summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi-Yo Chiang <yochiang@google.com> 2024-08-15 07:07:49 +0000
committer Yi-Yo Chiang <yochiang@google.com> 2024-08-15 07:52:02 +0000
commit3ffc37ce2048614918ece4d18d587516c93b7582 (patch)
tree2d44157cf3baf46ea26b310ef77f5c7521d85fdd
parent61bd3d11e9abed7598f176b69c87638d091e9b04 (diff)
Fix build_prop module to use partition() instead of PartitionTag()
PartitionTag() returns the partition the module is installed in. We don't want this because a system_ext_specific module could be installed in the system partition if system_ext partition doesn't exist. Instead we want system_ext specific modules to always refer to SystemExtPropFiles(). Bug: 359624775 Bug: 322090587 Test: build aosp_arm64 and verify system/system_ext/etc/build.prop Change-Id: Ie67ec9c5e5a07e781515e0aafb42122f72447cf3
-rw-r--r--android/build_prop.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/build_prop.go b/android/build_prop.go
index b127755c8..13d59f9f5 100644
--- a/android/build_prop.go
+++ b/android/build_prop.go
@@ -56,7 +56,7 @@ func (p *buildPropModule) stem() string {
}
func (p *buildPropModule) propFiles(ctx ModuleContext) Paths {
- partition := p.PartitionTag(ctx.DeviceConfig())
+ partition := p.partition(ctx.DeviceConfig())
if partition == "system" {
return ctx.Config().SystemPropFiles(ctx)
} else if partition == "system_ext" {