From 46eb0fd501cf2e9e391808b55a8c91d2364f10cc Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Thu, 23 Sep 2021 07:36:57 +0000 Subject: Remove updatable-bcp-packages.txt. Historically, this file was used by the `--updatable-bcp-packages-file` flag for dex2oat. The flag is no longer needed and is being deprecated. Unfortunately, we cannot remove `permitted_packages` and all the code related to it because we still need it for checking the module compatibility with Q and R. Bug: 200241946 Test: m nothing Change-Id: Ie3be54fd47a847ba0caf627d12da76b415d99466 --- java/platform_bootclasspath.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 36baf7e78..9fec08a69 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -424,14 +424,6 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. // Generate the framework profile rule bootFrameworkProfileRule(ctx, imageConfig) - // If always using prebuilt sdks then do not generate the updatable-bcp-packages.txt file as it - // will break because the prebuilts do not yet specify a permitted_packages property. - // TODO(b/193889859): Remove when the prebuilts have been updated. - if !ctx.Config().AlwaysUsePrebuiltSdks() { - // Generate the updatable bootclasspath packages rule. - generateUpdatableBcpPackagesRule(ctx, imageConfig, apexModules) - } - // Copy platform module dex jars to their predefined locations. platformBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, platformModules) copyBootJarsToPredefinedLocations(ctx, platformBootDexJarsByModule, imageConfig.dexPathsByModule) -- cgit v1.2.3-59-g8ed1b