From a3fc817771a0cb6a3f13cdb237477cf65714434a Mon Sep 17 00:00:00 2001 From: satayev Date: Tue, 25 May 2021 14:31:50 +0100 Subject: [PATCH] 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 --- java/bootclasspath_fragment.go | 12 ++---------- java/platform_bootclasspath.go | 9 ++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index e151d6315..e3b0a0f92 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -468,16 +468,8 @@ func (b *BootclasspathFragmentModule) generateClasspathProtoBuildActions(ctx and } func (b *BootclasspathFragmentModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList { - if "art" == proptools.String(b.properties.Image_name) { - return b.getImageConfig(ctx).modules - } - - global := dexpreopt.GetGlobalConfig(ctx) - - // Only create configs for updatable boot jars. Non-updatable boot jars must be part of the - // platform_bootclasspath's classpath proto config to guarantee that they come before any - // updatable jars at runtime. - return global.UpdatableBootJars.Filter(b.properties.Contents) + // TODO(satayev): populate with actual content + return android.EmptyConfiguredJarList() } func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleContext) *bootImageConfig { 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