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

Commit 0dbd02a3 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Revert "Fix build failure when building unbundled apps" 

This reverts commit c027119e.

Reason for revert: b/186797512
Test: vendor/google/build/build_mainline_modules.sh -j80

Change-Id: I2bb062cce09ac6717702c4f6b110acbb2887adec
parent c027119e

java/platform_bootclasspath.go

+1 −11
Original line number Diff line number Diff line
@@ -209,17 +209,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. 
	// Don't run any hiddenapi rules if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true. This is a performance

	// optimization that can be used to reduce the incremental build time but as its name suggests it

	// can be unsafe to use, e.g. when the changes affect anything that goes on the bootclasspath.

	// Instead create some rules to create fake hidden api files.

	config := ctx.Config()

	fakeHiddenApiRules := config.IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS")



	// Don't run them in an unbundled build either because the chances are that the modules needed

	// are not available.

	fakeHiddenApiRules = fakeHiddenApiRules || config.UnbundledBuild()



	// Don't run them when always using prebuilts as they won't necessarily have the dex boot jars

	// available.

	if fakeHiddenApiRules {

	if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {

		paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV}

		for _, path := range paths {

			ctx.Build(pctx, android.BuildParams{