diff options
| author | Artur Satayev <satayev@google.com> | 2021-05-25 16:46:33 +0000 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-05-25 21:00:31 +0100 |
| commit | 5cb569794e0ed05fabfc5cc655cb89d4a9d271e7 (patch) | |
| tree | 41c61627568e1a79bb176893dda65f3707ba87f7 /java/platform_bootclasspath.go | |
| parent | 931a4488da881ce24a8f29a4cfbf012df8e30952 (diff) | |
Revert "Partial Revert "Populate individual classpath_fragments'..."
Revert submission 14717811-revert-populate-platform-bootclasspath
Reason for revert: retry with a fix
Reverted Changes:
Ib58cd0211:Revert "Add bootclasspath_fragments to platform-bo...
I13b622d6c:Partial Revert "Populate individual classpath_frag...
Bug: 180105615
Test: atest sdkextensions_e2e_tests
Change-Id: I7b6b6b980a4c6430a70394e85222f3b35c4efd5f
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 85bf4b68b..87c695cb5 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -203,18 +203,11 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo func (b *platformBootclasspathModule) generateClasspathProtoBuildActions(ctx android.ModuleContext) { // ART and platform boot jars must have a corresponding entry in DEX2OATBOOTCLASSPATH classpathJars := configuredJarListToClasspathJars(ctx, b.ClasspathFragmentToConfiguredJarList(ctx), BOOTCLASSPATH, DEX2OATBOOTCLASSPATH) - - // TODO(satayev): remove updatable boot jars once each apex has its own fragment - global := dexpreopt.GetGlobalConfig(ctx) - classpathJars = append(classpathJars, configuredJarListToClasspathJars(ctx, global.UpdatableBootJars, BOOTCLASSPATH)...) - b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars) } func (b *platformBootclasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList { - global := dexpreopt.GetGlobalConfig(ctx) - // TODO(satayev): split ART apex jars into their own classpathFragment - return global.BootJars + return b.getImageConfig(ctx).modules } // checkNonUpdatableModules ensures that the non-updatable modules supplied are not part of an |