summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2024-12-26 23:30:03 +0000
committer Jihoon Kang <jihoonkang@google.com> 2024-12-26 23:33:12 +0000
commit56bf39e6762c294c201d13966d8be601f6f520ae (patch)
treea214f771f08cea7b3551b533f7fdd8cd11f8a9ee
parent7e04724866d1de291ce97f6f3c0ded21f1185daf (diff)
Do not collect empty build props
So that build prop is collected only from non-empty property modules in recovery_build_prop. Test: CI && ABTD Bug: 381888358 Change-Id: I885b89b0dd0baa67036b4ae5a134b033471377c3
-rw-r--r--android/recovery_build_prop.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/android/recovery_build_prop.go b/android/recovery_build_prop.go
index 91d190421..ac7d2ec15 100644
--- a/android/recovery_build_prop.go
+++ b/android/recovery_build_prop.go
@@ -83,8 +83,10 @@ func (r *recoveryBuildPropModule) getBuildProps(ctx ModuleContext) Paths {
r.properties.Product_build_prop,
r.properties.System_ext_build_prop,
} {
- if buildPropPath := PathForModuleSrc(ctx, proptools.String(buildProp)); buildPropPath != nil {
- buildProps = append(buildProps, buildPropPath)
+ if buildProp != nil {
+ if buildPropPath := PathForModuleSrc(ctx, proptools.String(buildProp)); buildPropPath != nil {
+ buildProps = append(buildProps, buildPropPath)
+ }
}
}
return buildProps