diff options
| author | satayev <satayev@google.com> | 2021-05-25 14:31:50 +0100 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-05-25 15:12:23 +0100 |
| commit | a3fc817771a0cb6a3f13cdb237477cf65714434a (patch) | |
| tree | fbfdd3da6db069657a88f111f31ad9d78792ef65 /java/platform_bootclasspath.go | |
| parent | b40610ad00c64c2d68647cce1bd27e8627c3e43d (diff) | |
Partial Revert "Populate individual classpath_fragments' classpaths.prot..."
Reason for revert: test breakage b/189114287
Bug: 180105615
Bug: 189114287
Test: atest sdkextensions_e2e_tests
Change-Id: I13b622d6c61ea392bfcc8a40535045c87fa3a7b5
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 5db2efe40..10bf179d2 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -203,11 +203,18 @@ 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 { - return b.getImageConfig(ctx).modules + global := dexpreopt.GetGlobalConfig(ctx) + // TODO(satayev): split ART apex jars into their own classpathFragment + return global.BootJars } // checkNonUpdatableModules ensures that the non-updatable modules supplied are not part of an |