diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-27 19:36:57 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-05-12 21:51:19 +0100 |
| commit | 7ebebfd5f80fc4a8f0f6e22253b9602802ebd88b (patch) | |
| tree | ff93a7a213bc68bda8a593e09c7db3f270ea5724 /java/platform_bootclasspath.go | |
| parent | c8aeb00a9cb273acc4b4f92beddf592642cc3e5e (diff) | |
Move copying of dex files from dexpreopt_bootjars singleton
The art dex files are copied in the bootclasspath_fragment and the
non-updatable and updatable dex files are copied in the
platform_bootclasspath.
Bug: 177892522
Test: m nothing
Change-Id: I5d3d533d1a7a9f8e7ae20c12eb33029a898a2cd6
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index c787e4797..eccea6172 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -196,7 +196,7 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo return } - b.generateBootImageBuildActions(ctx, updatableModules) + b.generateBootImageBuildActions(ctx, nonUpdatableModules, updatableModules) } // Generate classpaths.proto config @@ -430,7 +430,7 @@ func (b *platformBootclasspathModule) generateHiddenApiMakeVars(ctx android.Make } // generateBootImageBuildActions generates ninja rules related to the boot image creation. -func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.ModuleContext, updatableModules []android.Module) { +func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.ModuleContext, nonUpdatableModules, updatableModules []android.Module) { // Force the GlobalSoongConfig to be created and cached for use by the dex_bootjars // GenerateSingletonBuildActions method as it cannot create it for itself. dexpreopt.GetGlobalSoongConfig(ctx) @@ -451,5 +451,12 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. // Generate the updatable bootclasspath packages rule. generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules) + // Copy non-updatable module dex jars to their predefined locations. + copyBootJarsToPredefinedLocations(ctx, nonUpdatableModules, imageConfig.modules, imageConfig.dexPaths) + + // Copy updatable module dex jars to their predefined locations. + config := GetUpdatableBootConfig(ctx) + copyBootJarsToPredefinedLocations(ctx, updatableModules, config.modules, config.dexPaths) + dumpOatRules(ctx, imageConfig) } |