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

Commit b17d0446 authored by Paul Duffin's avatar Paul Duffin
Browse files

Transitively add APEX variants for contents of prebuilt_apex/apex_set 

This is part of the work needed to allow the exported_java_libs
property to be replaced by exported_bootclasspath_fragments.

Bug: 187266082
Test: m nothing
      m SOONG_CONFIG_art_module_source_build=false nothing
Change-Id: I2c1d70a390200b93163f9799719290c9d55a041c
parent 7c876923

apex/prebuilt.go

+31 −15
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ func (p *prebuiltCommon) deapexerDeps(ctx android.BottomUpMutatorContext) { 
	}

}



// Implements android.DepInInSameApex

func (p *prebuiltCommon) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {

	tag := ctx.OtherModuleDependencyTag(dep)

	_, ok := tag.(exportedDependencyTag)

	return ok

}



// apexInfoMutator marks any modules for which this apex exports a file as requiring an apex

// specific variant and checks that they are supported.

//
@@ -142,34 +149,43 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) { 


	// Collect the list of dependencies.

	var dependencies []android.ApexModule

	mctx.VisitDirectDeps(func(m android.Module) {

		tag := mctx.OtherModuleDependencyTag(m)

	mctx.WalkDeps(func(child, parent android.Module) bool {

		// If the child is not in the same apex as the parent then exit immediately and do not visit

		// any of the child's dependencies.

		if !android.IsDepInSameApex(mctx, parent, child) {

			return false

		}



		tag := mctx.OtherModuleDependencyTag(child)

		depName := mctx.OtherModuleName(child)

		if exportedTag, ok := tag.(exportedDependencyTag); ok {

			propertyName := exportedTag.name

			depName := mctx.OtherModuleName(m)



			// It is an error if the other module is not a prebuilt.

			if _, ok := m.(android.PrebuiltInterface); !ok {

			if !android.IsModulePrebuilt(child) {

				mctx.PropertyErrorf(propertyName, "%q is not a prebuilt module", depName)

				return

				return false

			}



			// It is an error if the other module is not an ApexModule.

			if _, ok := m.(android.ApexModule); !ok {

			if _, ok := child.(android.ApexModule); !ok {

				mctx.PropertyErrorf(propertyName, "%q is not usable within an apex", depName)

				return

				return false

			}

		}



		// Strip off the prebuilt_ prefix if present before storing content to ensure consistent

		// behavior whether there is a corresponding source module present or not.

		depName = android.RemoveOptionalPrebuiltPrefix(depName)



			// Remember that this module was added as a direct dependency.

			contents[depName] = contents[depName].Add(true)

		// Remember if this module was added as a direct dependency.

		direct := parent == mctx.Module()

		contents[depName] = contents[depName].Add(direct)



		// Add the module to the list of dependencies that need to have an APEX variant.

			dependencies = append(dependencies, m.(android.ApexModule))

		}

		dependencies = append(dependencies, child.(android.ApexModule))



		return true

	})



	// Create contents for the prebuilt_apex and store it away for later use.

java/java.go

+2 −1
Original line number Diff line number Diff line
@@ -1296,9 +1296,10 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		if ai.ForPrebuiltApex {

			if deapexerModule == nil {

				// This should never happen as a variant for a prebuilt_apex is only created if the

				// deapxer module has been configured to export the dex implementation jar for this module.

				// deapexer module has been configured to export the dex implementation jar for this module.

				ctx.ModuleErrorf("internal error: module %q does not depend on a `deapexer` module for prebuilt_apex %q",

					j.Name(), ai.ApexVariationName)

				return

			}



			// Get the path of the dex implementation jar from the `deapexer` module.