Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e95a15e7 authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix bootDexJarByModule with UNSAFE_DISABLE_HIDDENAPI_FLAGS 

Fixes: 191652687
Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true m
Change-Id: I7d85340681e54fbd0da69596b6846eb446c6ec6d
parent 789093a9

java/platform_bootclasspath.go

+3 −2
Original line number Diff line number Diff line
@@ -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")