diff options
| author | 2023-11-08 11:58:28 +0000 | |
|---|---|---|
| committer | 2023-11-08 11:58:28 +0000 | |
| commit | 7dbbbd43ba7145b1168f8a955eb38aa4e16ccb47 (patch) | |
| tree | 861018d717f4bffc1ffb132e837f818098545475 /java/platform_bootclasspath.go | |
| parent | 6db55ca70fa464cf8e25d2536d77a33088bf04c6 (diff) | |
| parent | f3c1e6f8fe5913887d740acd9fe10b52a42a8b4c (diff) | |
Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: f3c1e6f8fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578
Change-Id: I0e1d12c50b9c2c67ba5a55b89eb97ffe6ec5b84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 02a2298cd..0d52614ea 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -202,8 +202,6 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo bootDexJarByModule := b.generateHiddenAPIBuildActions(ctx, b.configuredModules, b.fragments) buildRuleForBootJarsPackageCheck(ctx, bootDexJarByModule) - - b.copyApexBootJarsForAppsDexpreopt(ctx, apexModules) } // Generate classpaths.proto config @@ -415,10 +413,3 @@ func (b *platformBootclasspathModule) generateHiddenApiMakeVars(ctx android.Make // INTERNAL_PLATFORM_HIDDENAPI_FLAGS is used by Make rules in art/ and cts/. ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_FLAGS", b.hiddenAPIFlagsCSV.String()) } - -// Copy apex module dex jars to their predefined locations. They will be used for dexpreopt for apps. -func (b *platformBootclasspathModule) copyApexBootJarsForAppsDexpreopt(ctx android.ModuleContext, apexModules []android.Module) { - config := GetApexBootConfig(ctx) - apexBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, apexModules) - copyBootJarsToPredefinedLocations(ctx, apexBootDexJarsByModule, config.dexPathsByModule) -} |