From 0dbd02a3ac8e0e3aa3066d8caf44740473847b16 Mon Sep 17 00:00:00 2001 From: Vishnu Nair Date: Fri, 30 Apr 2021 00:24:07 +0000 Subject: [PATCH] Revert "Fix build failure when building unbundled apps" This reverts commit c027119e73e9a211b7d2c1cafc978a750f11e920. Reason for revert: b/186797512 Test: vendor/google/build/build_mainline_modules.sh -j80 Change-Id: I2bb062cce09ac6717702c4f6b110acbb2887adec --- java/platform_bootclasspath.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index b256d76de..d341591d3 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -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{