From c618decdab06033ccaec7ab60684bddafe081376 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 21 Jun 2021 16:03:11 +0200 Subject: [PATCH] Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS Fixes: 191652687 Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true m Change-Id: I7d85340681e54fbd0da69596b6846eb446c6ec6d Merged-In: I7d85340681e54fbd0da69596b6846eb446c6ec6d (cherry picked from commit e95a15e7c791028365f8360ad8915a851f09a3f0) --- java/platform_bootclasspath.go | 5 +++-- 1 file 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")