Merge "Avoid permitted_packages related build failures in unbundled builds" (393bffee) · Commits · e / os / android_build_soong

java/platform_bootclasspath.go

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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)

			// 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.		// Generate the updatable bootclasspath packages rule.
	generateUpdatableBcpPackagesRule(ctx, imageConfig, updatableModules)		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)