diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-13 00:14:38 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-04-14 18:54:55 +0100 |
| commit | 85dee5d8fb8358392cb3eaba1bd15b45b8a28777 (patch) | |
| tree | 388863abce7c90b3700e3cded885bd2c0a236762 /java/platform_bootclasspath.go | |
| parent | 22c743170d304cc19136e25aa4dce4668fbfef71 (diff) | |
Move hidden API metadata file rule to platform_bootclasspath
This change moves the monolithic hidden API index file creation rule
from the hiddenAPISingleton into the platform_bootclasspath.
Bug: 179354495
Test: verified that the out/soong/hiddenapi/... files are unchanged
by this change
Change-Id: Ib25be3618e30a83dc2929a18062eb58eefdabefb
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 7a8edda18..994f1beab 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -341,6 +341,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. ruleToGenerateHiddenApiFlags(ctx, outputPath, baseFlagsPath, moduleSpecificFlagsPaths, augmentationInfo) b.generateHiddenAPIIndexRules(ctx, hiddenAPISupportingModules) + b.generatedHiddenAPIMetadataRules(ctx, hiddenAPISupportingModules) } func (b *platformBootclasspathModule) generateHiddenAPIIndexRules(ctx android.ModuleContext, modules []hiddenAPISupportingModule) { @@ -358,3 +359,22 @@ func (b *platformBootclasspathModule) generateHiddenAPIIndexRules(ctx android.Mo Inputs(indexes) rule.Build("platform-bootclasspath-monolithic-hiddenapi-index", "monolithic hidden API index") } + +func (b *platformBootclasspathModule) generatedHiddenAPIMetadataRules(ctx android.ModuleContext, modules []hiddenAPISupportingModule) { + metadataCSVFiles := android.Paths{} + for _, module := range modules { + metadataCSVFiles = append(metadataCSVFiles, module.metadataCSV()) + } + + rule := android.NewRuleBuilder(pctx, ctx) + + outputPath := hiddenAPISingletonPaths(ctx).metadata + + rule.Command(). + BuiltTool("merge_csv"). + Flag("--key_field signature"). + FlagWithOutput("--output=", outputPath). + Inputs(metadataCSVFiles) + + rule.Build("platform-bootclasspath-monolithic-hiddenapi-metadata", "monolithic hidden API metadata") +} |