diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-22 16:05:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-22 16:05:09 +0000 |
| commit | 7b905a3f10cbfcee2c54d3bf2345966273bd13fc (patch) | |
| tree | 9fb651ef7a956afa6ea517e97200030bafb15054 /java/platform_bootclasspath.go | |
| parent | 034196d9fe85d0c492c52dc9c89b4c9ddad1498e (diff) | |
| parent | c618decdab06033ccaec7ab60684bddafe081376 (diff) | |
Merge "Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS" into sc-dev
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 8bea9bb29..48da29eb2 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -266,6 +266,8 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. b.hiddenAPIIndexCSV = hiddenAPISingletonPaths(ctx).index b.hiddenAPIMetadataCSV = hiddenAPISingletonPaths(ctx).metadata + bootDexJarByModule := extractBootDexJarsFromModules(ctx, modules) + // 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. @@ -277,7 +279,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. Output: path, }) } - return nil + return bootDexJarByModule } monolithicInfo := b.createAndProvideMonolithicHiddenAPIInfo(ctx, fragments) @@ -292,7 +294,6 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. input.FlagFilesByCategory = monolithicInfo.FlagsFilesByCategory // Generate the monolithic stub-flags.csv file. - bootDexJarByModule := extractBootDexJarsFromModules(ctx, modules) stubFlags := hiddenAPISingletonPaths(ctx).stubFlags rule := ruleToGenerateHiddenAPIStubFlagsFile(ctx, stubFlags, bootDexJarByModule.bootDexJars(), input) rule.Build("platform-bootclasspath-monolithic-hiddenapi-stub-flags", "monolithic hidden API stub flags") |