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 --- java/dexpreopt.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/dexpreopt.go') diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 25e95db14..1acac1b40 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -196,8 +196,10 @@ func disableSourceApexVariant(ctx android.BaseModuleContext) bool { } apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider) psi := android.PrebuiltSelectionInfoMap{} - ctx.VisitDirectDepsWithTag(android.PrebuiltDepTag, func(am android.Module) { - psi, _ = android.OtherModuleProvider(ctx, am, android.PrebuiltSelectionInfoProvider) + ctx.VisitDirectDeps(func(am android.Module) { + if prebuiltSelectionInfo, ok := android.OtherModuleProvider(ctx, am, android.PrebuiltSelectionInfoProvider); ok { + psi = prebuiltSelectionInfo + } }) // Find the apex variant for this module _, apexVariantsWithoutTestApexes, _ := android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes) -- cgit v1.2.3-59-g8ed1b