Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c0d3f91 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Avoid permitted_packages related build failures in unbundled builds" am: 393bffee 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768416

Change-Id: I7d982db3d688644efe6e4bd96bcfe5ccb24c0fe2
parents a57b9883 393bffee

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)