diff options
| author | 2023-07-11 20:59:07 +0000 | |
|---|---|---|
| committer | 2023-07-11 20:59:07 +0000 | |
| commit | b898c112a2a4f14580a7f9c96355450034b33893 (patch) | |
| tree | 72b18d1121999c72d3bf37791b98edea6bb10183 /java/bootclasspath.go | |
| parent | 120b55a7ca624d5b2e95fa7d750fb0c4046f7f50 (diff) | |
| parent | 3444e561dc4b331fcb5381fa3dd9d31439692469 (diff) | |
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main
* changes:
Change the profile path on host.
Extract duplicate code to common helper functions.
Fix dumpOatRules.
Remove Modules() from BootclasspathFragmentApexContentInfo.
Fix some tests for dexpreopt and remove unnecessary tests.
Diffstat (limited to 'java/bootclasspath.go')
| -rw-r--r-- | java/bootclasspath.go | 2 |
1 files changed, 1 insertions, 1 deletions
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}, |