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

Merge "Revert "Fix build failure when building unbundled apps""

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-30 01:52:57 +00:00
committed by Gerrit Code Review
parent 5983d856c1 0dbd02a3ac
commit 1468cc4a10
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/platform_bootclasspath.go
View File

@@ -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 // 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 // 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. // 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. if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
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 {
paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV} paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV}
for _, path := range paths { for _, path := range paths {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{