From b1639db53f1df445f08924c6414bba53d9cee512 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 11 Jul 2023 15:03:13 +0100 Subject: Extract duplicate code to common helper functions. Also, fall back to using a default name for the dexpreopt directory if we are not building for Android. Bug: 290583827 Test: m nothing Change-Id: I3fc6ff9142a2dcdf995796f75891b242fe2848d0 --- java/bootclasspath.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/bootclasspath.go') diff --git a/java/bootclasspath.go b/java/bootclasspath.go index f4cef7fa6..29eed795d 100644 --- a/java/bootclasspath.go +++ b/java/bootclasspath.go @@ -77,7 +77,7 @@ func addDependencyOntoApexVariants(ctx android.BottomUpMutatorContext, propertyN // Use gatherApexModulePairDepsWithTag to retrieve the dependencies. func addDependencyOntoApexModulePair(ctx android.BottomUpMutatorContext, apex string, name string, tag blueprint.DependencyTag) { var variations []blueprint.Variation - if apex != "platform" && apex != "system_ext" { + if !android.IsConfiguredJarForPlatform(apex) { // Pick the correct apex variant. variations = []blueprint.Variation{ {Mutator: "apex", Variation: apex}, -- cgit v1.2.3-59-g8ed1b