From 00b2bfdea57286232ac6c7ec36742d95c9d7a04e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 12 Apr 2021 17:24:36 +0100 Subject: Move hidden API index file rule to platform_bootclasspath This change moves the monolithic hidden API index file creation rule from the hiddenAPIIndexSingleton into the platform_bootclasspath. It also moves the corresponding test from java/hiddenapi_singleton_test.go to java/platform_bootclasspath_test.go. Bug: 179354495 Test: verified that the out/soong/hiddenapi/... files are unchanged by this change Change-Id: Ia295d0f7ae9b51ea816f16921aa42339ed91704e --- java/platform_bootclasspath.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 621119ef3..7a8edda18 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -339,4 +339,22 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. outputPath := hiddenAPISingletonPaths(ctx).flags baseFlagsPath := hiddenAPISingletonPaths(ctx).stubFlags ruleToGenerateHiddenApiFlags(ctx, outputPath, baseFlagsPath, moduleSpecificFlagsPaths, augmentationInfo) + + b.generateHiddenAPIIndexRules(ctx, hiddenAPISupportingModules) +} + +func (b *platformBootclasspathModule) generateHiddenAPIIndexRules(ctx android.ModuleContext, modules []hiddenAPISupportingModule) { + indexes := android.Paths{} + for _, module := range modules { + indexes = append(indexes, module.indexCSV()) + } + + rule := android.NewRuleBuilder(pctx, ctx) + rule.Command(). + BuiltTool("merge_csv"). + Flag("--key_field signature"). + FlagWithArg("--header=", "signature,file,startline,startcol,endline,endcol,properties"). + FlagWithOutput("--output=", hiddenAPISingletonPaths(ctx).index). + Inputs(indexes) + rule.Build("platform-bootclasspath-monolithic-hiddenapi-index", "monolithic hidden API index") } -- cgit v1.2.3-59-g8ed1b