From a3a05460b478ed59c527dec1c8b2efa61ce9c53c Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Fri, 5 Apr 2024 00:36:44 +0000 Subject: 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 --- android/apex_contributions.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'android/apex_contributions.go') diff --git a/android/apex_contributions.go b/android/apex_contributions.go index dd09fbf44..03e32d6fa 100644 --- a/android/apex_contributions.go +++ b/android/apex_contributions.go @@ -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 { -- cgit v1.2.3-59-g8ed1b