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

Commit a3a05460 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Revert^2 "Remove compilation actions from java sdk library" 

This change modifies the build actions of java_sdk_library module type
so that it does not perform any compilation actions (i.e. does not
create the top level java_sdk_library jar file). Instead, it delegates
the build actions the top level jar file was performing to the
dynamically created ".impl"-suffixed java library module. The build
actions that are delegated to the impl library module include hiddenapi
processing, dexing, and dexpreopt.

This change relands https://r.android.com/3035972. Implementation
changes from the original change:
- "all_apex_contributions" is added as a dependecy to the implementation
  library modules where the parent sdk_library module has a prebuilt
  equivalent. This allows the source apex variant to be hidden from make
  when the prebuilt is active.

Test: patch in internal main, lunch barbet-ap2a-userdebug && m nothing
Test: m nothing --no-skip-soong-tests
Bug: 332785297
Change-Id: I017938e5567aef82e428e7ceb557d9c9090e0257
parent 248cc007

android/apex_contributions.go

+3 −3
Original line number Diff line number Diff line
@@ -103,12 +103,12 @@ type apexContributionsDepTag struct { 
}



var (

	acDepTag = apexContributionsDepTag{}

	AcDepTag = apexContributionsDepTag{}

)



// Creates a dep to each selected apex_contributions

func (a *allApexContributions) DepsMutator(ctx BottomUpMutatorContext) {

	ctx.AddDependency(ctx.Module(), acDepTag, ctx.Config().AllApexContributions()...)

	ctx.AddDependency(ctx.Module(), AcDepTag, ctx.Config().AllApexContributions()...)

}



// Set PrebuiltSelectionInfoProvider in post deps phase
@@ -142,7 +142,7 @@ func (a *allApexContributions) SetPrebuiltSelectionInfoProvider(ctx BaseModuleCo 
	// (e.g. shiba and shiba_fullmte)

	// Eventually these product variants will have their own release config maps.

	if !proptools.Bool(ctx.Config().BuildIgnoreApexContributionContents()) {

		ctx.VisitDirectDepsWithTag(acDepTag, func(child Module) {

		ctx.VisitDirectDepsWithTag(AcDepTag, func(child Module) {

			if m, ok := child.(*apexContributions); ok {

				addContentsToProvider(&p, m)

			} else {

android/base_module_context.go

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ func IsMetaDependencyTag(tag blueprint.DependencyTag) bool { 
		return true

	} else if tag == licensesTag {

		return true

	} else if tag == acDepTag {

	} else if tag == AcDepTag {

		return true

	}

	return false

android/prebuilt.go

+3 −3
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ func PrebuiltSourceDepsMutator(ctx BottomUpMutatorContext) { 
		// TODO: When all branches contain this singleton module, make this strict

		// TODO: Add this dependency only for mainline prebuilts and not every prebuilt module

		if ctx.OtherModuleExists("all_apex_contributions") {

			ctx.AddDependency(m, acDepTag, "all_apex_contributions")

			ctx.AddDependency(m, AcDepTag, "all_apex_contributions")

		}



	}
@@ -474,7 +474,7 @@ func PrebuiltSelectModuleMutator(ctx BottomUpMutatorContext) { 
		}

		// Propagate the provider received from `all_apex_contributions`

		// to the source module

		ctx.VisitDirectDepsWithTag(acDepTag, func(am Module) {

		ctx.VisitDirectDepsWithTag(AcDepTag, func(am Module) {

			psi, _ := OtherModuleProvider(ctx, am, PrebuiltSelectionInfoProvider)

			SetProvider(ctx, PrebuiltSelectionInfoProvider, psi)

		})
@@ -580,7 +580,7 @@ func PrebuiltPostDepsMutator(ctx BottomUpMutatorContext) { 
		bmn, _ := m.(baseModuleName)

		name := bmn.BaseModuleName()

		psi := PrebuiltSelectionInfoMap{}

		ctx.VisitDirectDepsWithTag(acDepTag, func(am Module) {

		ctx.VisitDirectDepsWithTag(AcDepTag, func(am Module) {

			psi, _ = OtherModuleProvider(ctx, am, PrebuiltSelectionInfoProvider)

		})

android/testing.go

+1 −1
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ func AndroidMkEntriesForTest(t *testing.T, ctx *TestContext, mod blueprint.Modul 


	entriesList := p.AndroidMkEntries()

	aconfigUpdateAndroidMkEntries(ctx, mod.(Module), &entriesList)

	for i, _ := range entriesList {

	for i := range entriesList {

		entriesList[i].fillInEntries(ctx, mod)

	}

	return entriesList

apex/apex.go

+7 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,13 @@ func apexFileForJavaModuleWithFile(ctx android.BaseModuleContext, module javaMod 
	af.jacocoReportClassesFile = module.JacocoReportClassesFile()

	af.lintDepSets = module.LintDepSets()

	af.customStem = module.Stem() + ".jar"

	if dexpreopter, ok := module.(java.DexpreopterInterface); ok {

	// TODO: b/338641779 - Remove special casing of sdkLibrary once bcpf and sscpf depends

	// on the implementation library

	if sdkLib, ok := module.(*java.SdkLibrary); ok {

		for _, install := range sdkLib.BuiltInstalledForApex() {

			af.requiredModuleNames = append(af.requiredModuleNames, install.FullModuleName())

		}

	} else if dexpreopter, ok := module.(java.DexpreopterInterface); ok {

		for _, install := range dexpreopter.DexpreoptBuiltInstalledForApex() {

			af.requiredModuleNames = append(af.requiredModuleNames, install.FullModuleName())

		}