diff options
| author | 2020-10-14 12:27:51 +0000 | |
|---|---|---|
| committer | 2020-10-14 12:27:51 +0000 | |
| commit | deea9b765952af4bf5057e20aecd2113596391cc (patch) | |
| tree | ae65aa7d05836d0d559f4efc528605f7dc3cad7f /java/droiddoc.go | |
| parent | 7cfb22f51801effb35e380015bb498685b023a3c (diff) | |
| parent | 527b2578ea3a300fab32546650442bb7a070f384 (diff) | |
Merge "Support building WITHOUT_CHECK_API=true" am: 527b2578ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1458439
Change-Id: I2ae68652c8ccc8ef62866ac3db12a38411464ac8
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 923a263a2..344b15e95 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1016,7 +1016,8 @@ type Droidstubs struct { annotationsZip android.WritablePath apiVersionsXml android.WritablePath - apiFilePath android.Path + apiFilePath android.Path + removedApiFilePath android.Path metadataZip android.WritablePath metadataDir android.WritablePath @@ -1059,7 +1060,7 @@ func (d *Droidstubs) OutputFiles(tag string) (android.Paths, error) { case ".api.txt": return android.Paths{d.apiFilePath}, nil case ".removed-api.txt": - return android.Paths{d.removedApiFile}, nil + return android.Paths{d.removedApiFilePath}, nil case ".annotations.zip": return android.Paths{d.annotationsZip}, nil case ".api_versions.xml": @@ -1074,7 +1075,7 @@ func (d *Droidstubs) ApiFilePath() android.Path { } func (d *Droidstubs) RemovedApiFilePath() android.Path { - return d.removedApiFile + return d.removedApiFilePath } func (d *Droidstubs) StubsSrcJar() android.Path { @@ -1125,6 +1126,9 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil d.apiFile = android.PathForModuleOut(ctx, filename) cmd.FlagWithOutput("--api ", d.apiFile) d.apiFilePath = d.apiFile + } else if sourceApiFile := proptools.String(d.properties.Check_api.Current.Api_file); sourceApiFile != "" { + // If check api is disabled then make the source file available for export. + d.apiFilePath = android.PathForModuleSrc(ctx, sourceApiFile) } if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") || @@ -1133,6 +1137,10 @@ func (d *Droidstubs) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuil filename := proptools.StringDefault(d.properties.Removed_api_filename, ctx.ModuleName()+"_removed.txt") d.removedApiFile = android.PathForModuleOut(ctx, filename) cmd.FlagWithOutput("--removed-api ", d.removedApiFile) + d.removedApiFilePath = d.removedApiFile + } else if sourceRemovedApiFile := proptools.String(d.properties.Check_api.Current.Removed_api_file); sourceRemovedApiFile != "" { + // If check api is disabled then make the source removed api file available for export. + d.removedApiFilePath = android.PathForModuleSrc(ctx, sourceRemovedApiFile) } if String(d.properties.Removed_dex_api_filename) != "" { |