diff options
Diffstat (limited to 'android/filegroup.go')
| -rw-r--r-- | android/filegroup.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/filegroup.go b/android/filegroup.go index a8326d46a..ff0f74e99 100644 --- a/android/filegroup.go +++ b/android/filegroup.go @@ -19,6 +19,7 @@ import ( "strings" "github.com/google/blueprint" + "github.com/google/blueprint/proptools" ) func init() { @@ -36,9 +37,9 @@ func RegisterFilegroupBuildComponents(ctx RegistrationContext) { type fileGroupProperties struct { // srcs lists files that will be included in this filegroup - Srcs []string `android:"path"` + Srcs proptools.Configurable[[]string] `android:"path"` - Exclude_srcs []string `android:"path"` + Exclude_srcs proptools.Configurable[[]string] `android:"path"` // The base path to the files. May be used by other modules to determine which portion // of the path to use. For example, when a filegroup is used as data in a cc_test rule, @@ -89,7 +90,7 @@ func (fg *fileGroup) JSONActions() []blueprint.JSONAction { } func (fg *fileGroup) GenerateAndroidBuildActions(ctx ModuleContext) { - fg.srcs = PathsForModuleSrcExcludes(ctx, fg.properties.Srcs, fg.properties.Exclude_srcs) + fg.srcs = PathsForModuleSrcExcludes(ctx, fg.properties.Srcs.GetOrDefault(ctx, nil), fg.properties.Exclude_srcs.GetOrDefault(ctx, nil)) if fg.properties.Path != nil { fg.srcs = PathsWithModuleSrcSubDir(ctx, fg.srcs, String(fg.properties.Path)) } |