diff options
| author | 2024-08-26 00:03:30 +0000 | |
|---|---|---|
| committer | 2024-08-26 00:03:30 +0000 | |
| commit | bc755944999d7b5b1ce1f862818ac88a18cf2b8f (patch) | |
| tree | a002410bcfb73c0d27147e6dc3b1895b09495e98 | |
| parent | ffb985e9bd296255aebc876861afb182ea0bec22 (diff) | |
| parent | 52d37c32498b56117f93900cd544e7610fe16462 (diff) | |
Merge "Make the defaults property non-configurable" into main
| -rw-r--r-- | android/defaults.go | 8 | ||||
| -rw-r--r-- | android/module_test.go | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/android/defaults.go b/android/defaults.go index c0a2fc68f..0d51d9d7c 100644 --- a/android/defaults.go +++ b/android/defaults.go @@ -28,7 +28,7 @@ type defaultsDependencyTag struct { var DefaultsDepTag defaultsDependencyTag type defaultsProperties struct { - Defaults proptools.Configurable[[]string] + Defaults []string } type DefaultableModuleBase struct { @@ -278,13 +278,13 @@ func RegisterDefaultsPreArchMutators(ctx RegisterMutatorsContext) { func defaultsDepsMutator(ctx BottomUpMutatorContext) { if defaultable, ok := ctx.Module().(Defaultable); ok { - ctx.AddDependency(ctx.Module(), DefaultsDepTag, defaultable.defaults().Defaults.GetOrDefault(ctx, nil)...) + ctx.AddDependency(ctx.Module(), DefaultsDepTag, defaultable.defaults().Defaults...) } } func defaultsMutator(ctx TopDownMutatorContext) { if defaultable, ok := ctx.Module().(Defaultable); ok { - defaults := defaultable.defaults().Defaults.GetOrDefault(ctx, nil) + defaults := defaultable.defaults().Defaults if len(defaults) > 0 { var defaultsList []Defaults seen := make(map[Defaults]bool) @@ -295,7 +295,7 @@ func defaultsMutator(ctx TopDownMutatorContext) { if !seen[defaults] { seen[defaults] = true defaultsList = append(defaultsList, defaults) - return len(defaults.defaults().Defaults.GetOrDefault(ctx, nil)) > 0 + return len(defaults.defaults().Defaults) > 0 } } else { ctx.PropertyErrorf("defaults", "module %s is not an defaults module", diff --git a/android/module_test.go b/android/module_test.go index 92041ec90..d64e3a591 100644 --- a/android/module_test.go +++ b/android/module_test.go @@ -722,6 +722,7 @@ test { propInfo{Name: "Arch.X86_64.A", Type: "string", Value: "x86_64 a"}, propInfo{Name: "B", Type: "bool", Value: "true"}, propInfo{Name: "C", Type: "string slice", Values: []string{"default_c", "c"}}, + propInfo{Name: "Defaults", Type: "string slice", Values: []string{"foo_defaults"}}, propInfo{Name: "Embedded_prop", Type: "string", Value: "a"}, propInfo{Name: "Name", Type: "string", Value: "foo"}, propInfo{Name: "Nested.E", Type: "string", Value: "nested e"}, |