Consolidate the code to resolve a deapexer module dependency. (4482560c) · Commits · e / os / android_build_soong

android/deapexer.go

+27 −2

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ import (

		// The information exported by the `deapexer` module, access it using `DeapxerInfoProvider`.
		type DeapexerInfo struct {
		apexModuleName string

		// map from the name of an exported file from a prebuilt_apex to the path to that file. The
		// exported file name is the apex relative path, e.g. javalib/core-libart.jar.
		//
		@@ -76,6 +78,11 @@ type DeapexerInfo struct {
		exports map[string]WritablePath
		}

		// ApexModuleName returns the name of the APEX module that provided the info.
		func (i DeapexerInfo) ApexModuleName() string {
		return i.apexModuleName
		}

		// PrebuiltExportPath provides the path, or nil if not available, of a file exported from the
		// prebuilt_apex that created this ApexInfo.
		//
		@@ -95,8 +102,9 @@ var DeapexerProvider = blueprint.NewProvider(DeapexerInfo{})
		// for use with a prebuilt_apex module.
		//
		// See apex/deapexer.go for more information.
		func NewDeapexerInfo(exports map[string]WritablePath) DeapexerInfo {
		func NewDeapexerInfo(apexModuleName string, exports map[string]WritablePath) DeapexerInfo {
		return DeapexerInfo{
		apexModuleName: apexModuleName,
		exports: exports,
		}
		}
		@@ -133,3 +141,20 @@ type RequiresFilesFromPrebuiltApexTag interface {
		// Method that differentiates this interface from others.
		RequiresFilesFromPrebuiltApex()
		}

		// FindDeapexerProviderForModule searches through the direct dependencies of the current context
		// module for a DeapexerTag dependency and returns its DeapexerInfo. If there is an error then it is
		// reported with ctx.ModuleErrorf and nil is returned.
		func FindDeapexerProviderForModule(ctx ModuleContext) *DeapexerInfo {
		var di *DeapexerInfo
		ctx.VisitDirectDepsWithTag(DeapexerTag, func(m Module) {
		p := ctx.OtherModuleProvider(m, DeapexerProvider).(DeapexerInfo)
		di = &p
		})
		if di != nil {
		return di
		}
		ai := ctx.Provider(ApexInfoProvider).(ApexInfo)
		ctx.ModuleErrorf("No prebuilt APEX provides a deapexer module for APEX variant %s", ai.ApexVariationName)
		return nil
		}

apex/apex_test.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -4859,8 +4859,11 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
		// Make sure that dexpreopt can access dex implementation files from the prebuilt.
		ctx := testDexpreoptWithApexes(t, bp, "", transform)

		deapexerName := deapexerModuleName("myapex")
		android.AssertStringEquals(t, "APEX module name from deapexer name", "myapex", apexModuleName(deapexerName))

		// Make sure that the deapexer has the correct input APEX.
		deapexer := ctx.ModuleForTests("myapex.deapexer", "android_common")
		deapexer := ctx.ModuleForTests(deapexerName, "android_common")
		rule := deapexer.Rule("deapexer")
		if expected, actual := []string{"myapex-arm64.apex"}, android.NormalizePathsForTesting(rule.Implicits); !reflect.DeepEqual(expected, actual) {
		t.Errorf("expected: %q, found: %q", expected, actual)

apex/deapexer.go

+16 −2

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		package apex

		import (
		"strings"

		"android/soong/android"
		)

		@@ -75,6 +77,17 @@ type Deapexer struct {
		inputApex android.Path
		}

		// Returns the name of the deapexer module corresponding to an APEX module with the given name.
		func deapexerModuleName(apexModuleName string) string {
		return apexModuleName + ".deapexer"
		}

		// Returns the name of the APEX module corresponding to an deapexer module with
		// the given name. This reverses deapexerModuleName.
		func apexModuleName(deapexerModuleName string) string {
		return strings.TrimSuffix(deapexerModuleName, ".deapexer")
		}

		func privateDeapexerFactory() android.Module {
		module := &Deapexer{}
		module.AddProperties(&module.properties, &module.selectedApexProperties)
		@@ -113,7 +126,8 @@ func (p *Deapexer) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		// apex relative path to extracted file path available for other modules.
		if len(exports) > 0 {
		// Make the information available for other modules.
		ctx.SetProvider(android.DeapexerProvider, android.NewDeapexerInfo(exports))
		di := android.NewDeapexerInfo(apexModuleName(ctx.ModuleName()), exports)
		ctx.SetProvider(android.DeapexerProvider, di)

		// Create a sorted list of the files that this exports.
		exportedPaths = android.SortedUniquePaths(exportedPaths)
		@@ -131,6 +145,6 @@ func (p *Deapexer) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		for _, p := range exportedPaths {
		command.Output(p.(android.WritablePath))
		}
		builder.Build("deapexer", "deapex "+ctx.ModuleName())
		builder.Build("deapexer", "deapex "+apexModuleName(ctx.ModuleName()))
		}
		}

apex/prebuilt.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -631,10 +631,6 @@ func createDeapexerModuleIfNeeded(ctx android.TopDownMutatorContext, deapexerNam
		)
		}

		func deapexerModuleName(baseModuleName string) string {
		return baseModuleName + ".deapexer"
		}

		func apexSelectorModuleName(baseModuleName string) string {
		return baseModuleName + ".apex.selector"
		}

java/bootclasspath_fragment.go

+3 −15

Original line number	Diff line number	Diff line
		@@ -954,23 +954,11 @@ func (module *prebuiltBootclasspathFragmentModule) produceBootImageFiles(ctx and
		return nil
		}

		var deapexerModule android.Module
		ctx.VisitDirectDeps(func(module android.Module) {
		tag := ctx.OtherModuleDependencyTag(module)
		// Save away the `deapexer` module on which this depends, if any.
		if tag == android.DeapexerTag {
		deapexerModule = module
		}
		})

		if deapexerModule == nil {
		// This should never happen as a variant for a prebuilt_apex is only created if the
		// deapexer module has been configured to export the dex implementation jar for this module.
		ctx.ModuleErrorf("internal error: module does not depend on a `deapexer` module")
		return nil
		di := android.FindDeapexerProviderForModule(ctx)
		if di == nil {
		return nil // An error has been reported by FindDeapexerProviderForModule.
		}

		di := ctx.OtherModuleProvider(deapexerModule, android.DeapexerProvider).(android.DeapexerInfo)
		files := bootImageFilesByArch{}
		for _, variant := range imageConfig.apexVariants() {
		arch := variant.target.Arch.ArchType