Merge "Cleanup configurable getter usages" into main (c6f1fe08) · Commits · e / os / android_build_soong

android/defaults.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.Module().ConfigurableEvaluator(ctx), nil)...)
		ctx.AddDependency(ctx.Module(), DefaultsDepTag, defaultable.defaults().Defaults.GetOrDefault(ctx, nil)...)
		}
		}

		func defaultsMutator(ctx TopDownMutatorContext) {
		if defaultable, ok := ctx.Module().(Defaultable); ok {
		defaults := defaultable.defaults().Defaults.GetOrDefault(ctx.Module().ConfigurableEvaluator(ctx), nil)
		defaults := defaultable.defaults().Defaults.GetOrDefault(ctx, nil)
		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.Module().ConfigurableEvaluator(ctx), nil)) > 0
		return len(defaults.defaults().Defaults.GetOrDefault(ctx, nil)) > 0
		}
		} else {
		ctx.PropertyErrorf("defaults", "module %s is not an defaults module",

android/module.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1853,7 +1853,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
		}
		}

		m.vintfFragmentsPaths = PathsForModuleSrc(ctx, m.commonProperties.Vintf_fragments.GetOrDefault(m.ConfigurableEvaluator(ctx), nil))
		m.vintfFragmentsPaths = PathsForModuleSrc(ctx, m.commonProperties.Vintf_fragments.GetOrDefault(ctx, nil))
		vintfDir := PathForModuleInstall(ctx, "etc", "vintf", "manifest")
		for _, src := range m.vintfFragmentsPaths {
		installedVintfFragment := vintfDir.Join(ctx, src.Base())

apex/apex.go

+5 −5

Original line number	Diff line number	Diff line
		@@ -262,10 +262,10 @@ func (a *ApexNativeDependencies) Merge(ctx android.BaseMutatorContext, b ApexNat
		a.Native_shared_libs = append(a.Native_shared_libs, b.Native_shared_libs...)
		a.Jni_libs = append(a.Jni_libs, b.Jni_libs...)
		a.Rust_dyn_libs = append(a.Rust_dyn_libs, b.Rust_dyn_libs...)
		a.ResolvedBinaries = append(a.ResolvedBinaries, b.Binaries.GetOrDefault(ctx.Module().ConfigurableEvaluator(ctx), nil)...)
		a.ResolvedBinaries = append(a.ResolvedBinaries, b.Binaries.GetOrDefault(ctx, nil)...)
		a.Tests = append(a.Tests, b.Tests...)
		a.Filesystems = append(a.Filesystems, b.Filesystems...)
		a.ResolvedPrebuilts = append(a.ResolvedPrebuilts, b.Prebuilts.GetOrDefault(ctx.Module().ConfigurableEvaluator(ctx), nil)...)
		a.ResolvedPrebuilts = append(a.ResolvedPrebuilts, b.Prebuilts.GetOrDefault(ctx, nil)...)

		a.Exclude_native_shared_libs = append(a.Exclude_native_shared_libs, b.Exclude_native_shared_libs...)
		a.Exclude_jni_libs = append(a.Exclude_jni_libs, b.Exclude_jni_libs...)
		@@ -842,7 +842,7 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
		}
		}

		a.properties.ResolvedSystemserverclasspathFragments = a.properties.Systemserverclasspath_fragments.GetOrDefault(a.ConfigurableEvaluator(ctx), nil)
		a.properties.ResolvedSystemserverclasspathFragments = a.properties.Systemserverclasspath_fragments.GetOrDefault(ctx, nil)

		// Common-arch dependencies come next
		commonVariation := ctx.Config().AndroidCommonTarget.Variations()
		@@ -861,9 +861,9 @@ func (a *apexBundle) OverridablePropertiesDepsMutator(ctx android.BottomUpMutato
		}

		commonVariation := ctx.Config().AndroidCommonTarget.Variations()
		ctx.AddFarVariationDependencies(commonVariation, androidAppTag, a.overridableProperties.Apps.GetOrDefault(a.ConfigurableEvaluator(ctx), nil)...)
		ctx.AddFarVariationDependencies(commonVariation, androidAppTag, a.overridableProperties.Apps.GetOrDefault(ctx, nil)...)
		ctx.AddFarVariationDependencies(commonVariation, bpfTag, a.overridableProperties.Bpfs...)
		if prebuilts := a.overridableProperties.Prebuilts.GetOrDefault(a.ConfigurableEvaluator(ctx), nil); len(prebuilts) > 0 {
		if prebuilts := a.overridableProperties.Prebuilts.GetOrDefault(ctx, nil); len(prebuilts) > 0 {
		// For prebuilt_etc, use the first variant (64 on 64/32bit device, 32 on 32bit device)
		// regardless of the TARGET_PREFER_* setting. See b/144532908
		arches := ctx.DeviceConfig().Arches()

apex/builder.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -704,7 +704,7 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) {
		optFlags = append(optFlags, "--override_apk_package_name "+manifestPackageName)
		}

		androidManifest := a.properties.AndroidManifest.GetOrDefault(a.ConfigurableEvaluator(ctx), "")
		androidManifest := a.properties.AndroidManifest.GetOrDefault(ctx, "")
		if androidManifest != "" {
		androidManifestFile := android.PathForModuleSrc(ctx, androidManifest)

		@@ -1196,7 +1196,7 @@ func (a *apexBundle) buildCannedFsConfig(ctx android.ModuleContext, defaultReadO
		}
		// Custom fs_config is "appended" to the last so that entries from the file are preferred
		// over default ones set above.
		customFsConfig := a.properties.Canned_fs_config.GetOrDefault(a.ConfigurableEvaluator(ctx), "")
		customFsConfig := a.properties.Canned_fs_config.GetOrDefault(ctx, "")
		if customFsConfig != "" {
		cmd.Text("cat").Input(android.PathForModuleSrc(ctx, customFsConfig))
		}

filesystem/vbmeta.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ type vbmetaDep struct {
		var vbmetaPartitionDep = vbmetaDep{kind: "partition"}

		func (v *vbmeta) DepsMutator(ctx android.BottomUpMutatorContext) {
		ctx.AddDependency(ctx.Module(), vbmetaPartitionDep, v.properties.Partitions.GetOrDefault(v.ConfigurableEvaluator(ctx), nil)...)
		ctx.AddDependency(ctx.Module(), vbmetaPartitionDep, v.properties.Partitions.GetOrDefault(ctx, nil)...)
		}

		func (v *vbmeta) installFileName() string {