StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid permitted_packages related build failures in unbundled builds"

Browse Source
This commit is contained in:
Paul Duffin
2021-07-16 19:06:20 +00:00
committed by Gerrit Code Review
parent b68048e520 3bc8e218f9
commit 393bffee78
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/platform_bootclasspath.go
View File

@@ -423,8 +423,13 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.
// Generate the framework profile rule // Generate the framework profile rule
bootFrameworkProfileRule(ctx, imageConfig) bootFrameworkProfileRule(ctx, imageConfig)
// Generate the updatable bootclasspath packages rule. // If always using prebuilt sdks then do not generate the updatable-bcp-packages.txt file as it
generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules) // 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, updatableModules)
}
// Copy non-updatable module dex jars to their predefined locations. // Copy non-updatable module dex jars to their predefined locations.
nonUpdatableBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, nonUpdatableModules) nonUpdatableBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, nonUpdatableModules)