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

Commit 67a28425 authored by Yu Liu's avatar Yu Liu
Browse files

Validate aconfig libs are built with the correct modes. 

Bug: 323071835
Test: Unit tests and manual tests.
Change-Id: I32de90826c7c8bb4d8495608e959d554820ab9a2
parent eefca737

aconfig/codegen/aconfig_declarations_group.go

+14 −4
Original line number Original line Diff line number Diff line
@@ -15,9 +15,10 @@ 
package codegen

package codegen





import (

import (

	"android/soong/aconfig"

	"android/soong/android"

	"fmt"

	"fmt"

	"maps"



	"android/soong/android"





	"github.com/google/blueprint"

	"github.com/google/blueprint"

)

)
@@ -43,6 +44,7 @@ type AconfigDeclarationsGroup struct { 
	aconfigDeclarationNames      []string

	aconfigDeclarationNames      []string

	intermediateCacheOutputPaths android.Paths

	intermediateCacheOutputPaths android.Paths

	javaSrcjars                  android.Paths

	javaSrcjars                  android.Paths

	modeInfos                    map[string]android.ModeInfo

}

}





type AconfigDeclarationsGroupProperties struct {

type AconfigDeclarationsGroupProperties struct {
@@ -76,9 +78,10 @@ func (adg *AconfigDeclarationsGroup) DepsMutator(ctx android.BottomUpMutatorCont 
}

}





func (adg *AconfigDeclarationsGroup) VisitDeps(ctx android.ModuleContext) {

func (adg *AconfigDeclarationsGroup) VisitDeps(ctx android.ModuleContext) {

	adg.modeInfos = make(map[string]android.ModeInfo)

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

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

		tag := ctx.OtherModuleDependencyTag(dep)

		tag := ctx.OtherModuleDependencyTag(dep)

		if provider, ok := android.OtherModuleProvider(ctx, dep, aconfig.CodegenInfoProvider); ok {

		if provider, ok := android.OtherModuleProvider(ctx, dep, android.CodegenInfoProvider); ok {





			// aconfig declaration names and cache files are collected for all aconfig library dependencies

			// aconfig declaration names and cache files are collected for all aconfig library dependencies

			adg.aconfigDeclarationNames = append(adg.aconfigDeclarationNames, provider.AconfigDeclarations...)

			adg.aconfigDeclarationNames = append(adg.aconfigDeclarationNames, provider.AconfigDeclarations...)
@@ -88,8 +91,14 @@ func (adg *AconfigDeclarationsGroup) VisitDeps(ctx android.ModuleContext) { 
			case aconfigDeclarationsGroupTag:

			case aconfigDeclarationsGroupTag:

				// Will retrieve outputs from another language codegen modules when support is added

				// Will retrieve outputs from another language codegen modules when support is added

				adg.javaSrcjars = append(adg.javaSrcjars, provider.Srcjars...)

				adg.javaSrcjars = append(adg.javaSrcjars, provider.Srcjars...)

				maps.Copy(adg.modeInfos, provider.ModeInfos)

			case javaAconfigLibraryTag:

			case javaAconfigLibraryTag:

				adg.javaSrcjars = append(adg.javaSrcjars, provider.Srcjars...)

				adg.javaSrcjars = append(adg.javaSrcjars, provider.Srcjars...)

				maps.Copy(adg.modeInfos, provider.ModeInfos)

			case ccAconfigLibraryTag:

				maps.Copy(adg.modeInfos, provider.ModeInfos)

			case rustAconfigLibraryTag:

				maps.Copy(adg.modeInfos, provider.ModeInfos)

			}

			}

		}

		}

	})

	})
@@ -100,10 +109,11 @@ func (adg *AconfigDeclarationsGroup) GenerateAndroidBuildActions(ctx android.Mod 
	adg.aconfigDeclarationNames = android.FirstUniqueStrings(adg.aconfigDeclarationNames)

	adg.aconfigDeclarationNames = android.FirstUniqueStrings(adg.aconfigDeclarationNames)

	adg.intermediateCacheOutputPaths = android.FirstUniquePaths(adg.intermediateCacheOutputPaths)

	adg.intermediateCacheOutputPaths = android.FirstUniquePaths(adg.intermediateCacheOutputPaths)





	android.SetProvider(ctx, aconfig.CodegenInfoProvider, aconfig.CodegenInfo{

	android.SetProvider(ctx, android.CodegenInfoProvider, android.CodegenInfo{

		AconfigDeclarations:          adg.aconfigDeclarationNames,

		AconfigDeclarations:          adg.aconfigDeclarationNames,

		IntermediateCacheOutputPaths: adg.intermediateCacheOutputPaths,

		IntermediateCacheOutputPaths: adg.intermediateCacheOutputPaths,

		Srcjars:                      adg.javaSrcjars,

		Srcjars:                      adg.javaSrcjars,

		ModeInfos:                    adg.modeInfos,

	})

	})

}

}

aconfig/codegen/cc_aconfig_library.go

+8 −0
Original line number Original line Diff line number Diff line
@@ -146,4 +146,12 @@ func (this *CcAconfigLibraryCallbacks) GeneratorBuildActions(ctx cc.ModuleContex 
			"mode":   mode,

			"mode":   mode,

		},

		},

	})

	})



	android.SetProvider(ctx, android.CodegenInfoProvider, android.CodegenInfo{

		ModeInfos: map[string]android.ModeInfo{

			ctx.ModuleName(): {

				Container: declarations.Container,

				Mode:      mode,

			}},

	})

}
 
}

aconfig/codegen/java_aconfig_library.go

+6 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ package codegen 
import (

import (

	"fmt"

	"fmt"





	"android/soong/aconfig"

	"android/soong/android"

	"android/soong/android"

	"android/soong/java"

	"android/soong/java"
@@ -119,10 +118,15 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild 
		module.AddJarJarRenameRule(declarations.Package+".FakeFeatureFlagsImpl", "")

		module.AddJarJarRenameRule(declarations.Package+".FakeFeatureFlagsImpl", "")

	}

	}





	android.SetProvider(ctx, aconfig.CodegenInfoProvider, aconfig.CodegenInfo{

	android.SetProvider(ctx, android.CodegenInfoProvider, android.CodegenInfo{

		AconfigDeclarations:          []string{declarationsModules[0].Name()},

		AconfigDeclarations:          []string{declarationsModules[0].Name()},

		IntermediateCacheOutputPaths: android.Paths{declarations.IntermediateCacheOutputPath},

		IntermediateCacheOutputPaths: android.Paths{declarations.IntermediateCacheOutputPath},

		Srcjars:                      android.Paths{srcJarPath},

		Srcjars:                      android.Paths{srcJarPath},

		ModeInfos: map[string]android.ModeInfo{

			ctx.ModuleName(): {

				Container: declarations.Container,

				Mode:      mode,

			}},

	})

	})





	return srcJarPath

	return srcJarPath

aconfig/codegen/rust_aconfig_library.go

+9 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,15 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path 
		},

		},

	})

	})

	a.BaseSourceProvider.OutputFiles = android.Paths{generatedSource}

	a.BaseSourceProvider.OutputFiles = android.Paths{generatedSource}



	android.SetProvider(ctx, android.CodegenInfoProvider, android.CodegenInfo{

		ModeInfos: map[string]android.ModeInfo{

			ctx.ModuleName(): {

				Container: declarations.Container,

				Mode:      mode,

			}},

	})



	return generatedSource

	return generatedSource

}

}

aconfig/init.go

+0 −14
Original line number Original line Diff line number Diff line
@@ -20,20 +20,6 @@ import ( 
	"github.com/google/blueprint"

	"github.com/google/blueprint"

)

)





type CodegenInfo struct {

	// AconfigDeclarations is the name of the aconfig_declarations modules that

	// the codegen module is associated with

	AconfigDeclarations []string



	// Paths to the cache files of the associated aconfig_declaration modules

	IntermediateCacheOutputPaths android.Paths



	// Paths to the srcjar files generated from the java_aconfig_library modules

	Srcjars android.Paths

}



var CodegenInfoProvider = blueprint.NewProvider[CodegenInfo]()



var (

var (

	pctx = android.NewPackageContext("android/soong/aconfig")

	pctx = android.NewPackageContext("android/soong/aconfig")