diff options
| author | 2021-06-14 08:20:50 +0000 | |
|---|---|---|
| committer | 2021-06-14 08:20:50 +0000 | |
| commit | cc1bd8364ae7d835fd5d882316e1236f33e59f8e (patch) | |
| tree | 4af7634627d3dc419e9174cc306e5ca368dff4fe /java/platform_bootclasspath.go | |
| parent | a11b8707f1fa665036161ab0cc2a4ebed988469d (diff) | |
| parent | 5f148ca7cf2e9a9478922577b7ed70b1caacb55e (diff) | |
Merge "Make copyBootJarsToPredefinedLocations simpler and less fragile"
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 7d1e53f8c..a4beb8970 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -389,11 +389,13 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules) // Copy non-updatable module dex jars to their predefined locations. - copyBootJarsToPredefinedLocations(ctx, nonUpdatableModules, imageConfig.modules, imageConfig.dexPaths) + nonUpdatableBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, nonUpdatableModules) + copyBootJarsToPredefinedLocations(ctx, nonUpdatableBootDexJarsByModule, imageConfig.dexPathsByModule) // Copy updatable module dex jars to their predefined locations. config := GetUpdatableBootConfig(ctx) - copyBootJarsToPredefinedLocations(ctx, updatableModules, config.modules, config.dexPaths) + updatableBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, updatableModules) + copyBootJarsToPredefinedLocations(ctx, updatableBootDexJarsByModule, config.dexPathsByModule) // Build a profile for the image config and then use that to build the boot image. profile := bootImageProfileRule(ctx, imageConfig) |