Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 313aa547 authored by Colin Cross's avatar Colin Cross
Browse files

Convert OtherModuleProvider to generic providers API 

Convert all of the callers of OtherModuleProvider/OtherModuleHasProvider
to use the type-safe android.OtherModuleProvider API.

Bug: 316410648
Test: builds
Change-Id: Id77f514d68761a262d9ea830a601dbed804bbbe5
parent ff694a8c

aconfig/aconfig_declarations.go

+9 −12
Original line number Diff line number Diff line
@@ -134,11 +134,7 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module 
	// Get the values that came from the global RELEASE_ACONFIG_VALUE_SETS flag

	valuesFiles := make([]android.Path, 0)

	ctx.VisitDirectDeps(func(dep android.Module) {

		if !ctx.OtherModuleHasProvider(dep, valueSetProviderKey) {

			// Other modules get injected as dependencies too, for example the license modules

			return

		}

		depData := ctx.OtherModuleProvider(dep, valueSetProviderKey).(valueSetProviderData)

		if depData, ok := android.OtherModuleProvider(ctx, dep, valueSetProviderKey); ok {

			paths, ok := depData.AvailablePackages[module.properties.Package]

			if ok {

				valuesFiles = append(valuesFiles, paths...)
@@ -146,6 +142,7 @@ func (module *DeclarationsModule) GenerateAndroidBuildActions(ctx android.Module 
					module.properties.Values = append(module.properties.Values, path.String())

				}

			}

		}

	})



	// Intermediate format
@@ -190,11 +187,11 @@ func CollectDependencyAconfigFiles(ctx android.ModuleContext, mergedAconfigFiles 
		*mergedAconfigFiles = make(map[string]android.Paths)

	}

	ctx.VisitDirectDeps(func(module android.Module) {

		if dep := ctx.OtherModuleProvider(module, DeclarationsProviderKey).(DeclarationsProviderData); dep.IntermediateCacheOutputPath != nil {

		if dep, _ := android.OtherModuleProvider(ctx, module, DeclarationsProviderKey); dep.IntermediateCacheOutputPath != nil {

			(*mergedAconfigFiles)[dep.Container] = append((*mergedAconfigFiles)[dep.Container], dep.IntermediateCacheOutputPath)

			return

		}

		if dep := ctx.OtherModuleProvider(module, TransitiveDeclarationsInfoProvider).(TransitiveDeclarationsInfo); len(dep.AconfigFiles) > 0 {

		if dep, _ := android.OtherModuleProvider(ctx, module, TransitiveDeclarationsInfoProvider); len(dep.AconfigFiles) > 0 {

			for container, v := range dep.AconfigFiles {

				(*mergedAconfigFiles)[container] = append((*mergedAconfigFiles)[container], v...)

			}

aconfig/aconfig_value_set.go

+4 −8
Original line number Diff line number Diff line
@@ -73,15 +73,11 @@ func (module *ValueSetModule) GenerateAndroidBuildActions(ctx android.ModuleCont 
	// to append values to their aconfig actions.

	packages := make(map[string]android.Paths)

	ctx.VisitDirectDeps(func(dep android.Module) {

		if !ctx.OtherModuleHasProvider(dep, valuesProviderKey) {

			// Other modules get injected as dependencies too, for example the license modules

			return

		}

		depData := ctx.OtherModuleProvider(dep, valuesProviderKey).(valuesProviderData)



		if depData, ok := android.OtherModuleProvider(ctx, dep, valuesProviderKey); ok {

			srcs := make([]android.Path, len(depData.Values))

			copy(srcs, depData.Values)

			packages[depData.Package] = srcs

		}



	})

	android.SetProvider(ctx, valueSetProviderKey, valueSetProviderData{

aconfig/codegen/cc_aconfig_library.go

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ func (this *CcAconfigLibraryCallbacks) GeneratorSources(ctx cc.ModuleContext) cc 
	if len(declarationsModules) != 1 {

		panic(fmt.Errorf("Exactly one aconfig_declarations property required"))

	}

	declarations := ctx.OtherModuleProvider(declarationsModules[0], aconfig.DeclarationsProviderKey).(aconfig.DeclarationsProviderData)

	declarations, _ := android.OtherModuleProvider(ctx, declarationsModules[0], aconfig.DeclarationsProviderKey)



	// Figure out the generated file paths.  This has to match aconfig's codegen_cpp.rs.

	this.generatedDir = android.PathForModuleGen(ctx)
@@ -122,7 +122,7 @@ func (this *CcAconfigLibraryCallbacks) GeneratorBuildActions(ctx cc.ModuleContex 
	if len(declarationsModules) != 1 {

		panic(fmt.Errorf("Exactly one aconfig_declarations property required"))

	}

	declarations := ctx.OtherModuleProvider(declarationsModules[0], aconfig.DeclarationsProviderKey).(aconfig.DeclarationsProviderData)

	declarations, _ := android.OtherModuleProvider(ctx, declarationsModules[0], aconfig.DeclarationsProviderKey)



	mode := proptools.StringDefault(this.properties.Mode, "production")

	if !isModeSupported(mode) {

aconfig/codegen/java_aconfig_library.go

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild 
	if len(declarationsModules) != 1 {

		panic(fmt.Errorf("Exactly one aconfig_declarations property required"))

	}

	declarations := ctx.OtherModuleProvider(declarationsModules[0], aconfig.DeclarationsProviderKey).(aconfig.DeclarationsProviderData)

	declarations, _ := android.OtherModuleProvider(ctx, declarationsModules[0], aconfig.DeclarationsProviderKey)



	// Generate the action to build the srcjar

	srcJarPath := android.PathForModuleGen(ctx, ctx.ModuleName()+".srcjar")

aconfig/codegen/rust_aconfig_library.go

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path 
	if len(declarationsModules) != 1 {

		panic(fmt.Errorf("Exactly one aconfig_declarations property required"))

	}

	declarations := ctx.OtherModuleProvider(declarationsModules[0], aconfig.DeclarationsProviderKey).(aconfig.DeclarationsProviderData)

	declarations, _ := android.OtherModuleProvider(ctx, declarationsModules[0], aconfig.DeclarationsProviderKey)



	mode := proptools.StringDefault(a.Properties.Mode, "production")

	if !isModeSupported(mode) {