openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix build failure when building unbundled apps" am: 5983d856c1 

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

Change-Id: I23780570f7ea33639d479dcbbd0b5e5870d523f4
This commit is contained in:
Paul Duffin 2021-04-29 20:59:52 +00:00 committed by Automerger Merge Worker
parent 8eee268aa7 5983d856c1
commit 7e953b936d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/platform_bootclasspath.go
View File

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