Enable select syntax support for phony_deps
in phony_rule
Previously, `phony_deps` in `phony_rule` was a simple []string type, so the select syntax was not supported. This change modifies it to a Configurable[[]string] type to enable select syntax support. Bug: 354850153 Test: Add select syntax in the Andorid.bp Change-Id: Ibc5e5ee5d8fb9c19dc45d744a71b625fe94c9d88
This commit is contained in:
parent
10ec15d67c
commit
4427aab6e3
1 changed files with 8 additions and 4 deletions
|
@ -20,6 +20,8 @@ import (
|
|||
"strings"
|
||||
|
||||
"android/soong/android"
|
||||
|
||||
"github.com/google/blueprint/proptools"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
@ -88,14 +90,15 @@ type PhonyRule struct {
|
|||
android.ModuleBase
|
||||
android.DefaultableModuleBase
|
||||
|
||||
properties PhonyProperties
|
||||
phonyDepsModuleNames []string
|
||||
properties PhonyProperties
|
||||
}
|
||||
|
||||
type PhonyProperties struct {
|
||||
// The Phony_deps is the set of all dependencies for this target,
|
||||
// and it can function similarly to .PHONY in a makefile.
|
||||
// Additionally, dependencies within it can even include genrule.
|
||||
Phony_deps []string
|
||||
Phony_deps proptools.Configurable[[]string]
|
||||
}
|
||||
|
||||
// The phony_rule provides functionality similar to the .PHONY in a makefile.
|
||||
|
@ -109,13 +112,14 @@ func PhonyRuleFactory() android.Module {
|
|||
}
|
||||
|
||||
func (p *PhonyRule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
p.phonyDepsModuleNames = p.properties.Phony_deps.GetOrDefault(p.ConfigurableEvaluator(ctx), nil)
|
||||
}
|
||||
|
||||
func (p *PhonyRule) AndroidMk() android.AndroidMkData {
|
||||
return android.AndroidMkData{
|
||||
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
||||
if len(p.properties.Phony_deps) > 0 {
|
||||
depModulesStr := strings.Join(p.properties.Phony_deps, " ")
|
||||
if len(p.phonyDepsModuleNames) > 0 {
|
||||
depModulesStr := strings.Join(p.phonyDepsModuleNames, " ")
|
||||
fmt.Fprintln(w, ".PHONY:", name)
|
||||
fmt.Fprintln(w, name, ":", depModulesStr)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue