From d8aed4b275ddc68b7ca84dda3fe7df1765ffe23b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 26 Nov 2020 00:26:42 +0000 Subject: [PATCH] droidstubs: Remove unnecessary setting of DistFiles Instead of setting DistFiles to use the api stub (if present) as the default dist file this simply makes OutputFiles(tag) return the api stub file for the DefaultDistTag. Test: m nothing m dist sdk - before and after this change, compare result to make sure that there are no significant differences. Bug: 174226317 Change-Id: I39d615c5bf8d20d59db7eeb98d942210ec0aa8ba --- java/androidmk.go | 5 ----- java/droiddoc.go | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/androidmk.go b/java/androidmk.go index 25369ad9a..9ad3f9b26 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -523,17 +523,12 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries { // Note that dstubs.apiFile can be also be nil if WITHOUT_CHECKS_API is true. // TODO(b/146727827): Revert when we do not need to generate stubs and API separately. - var distFiles android.TaggedDistFiles - if dstubs.apiFile != nil { - distFiles = android.MakeDefaultDistFiles(dstubs.apiFile) - } outputFile := android.OptionalPathForPath(dstubs.stubsSrcJar) if !outputFile.Valid() { outputFile = android.OptionalPathForPath(dstubs.apiFile) } return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "JAVA_LIBRARIES", - DistFiles: distFiles, OutputFile: outputFile, Include: "$(BUILD_SYSTEM)/soong_droiddoc_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ diff --git a/java/droiddoc.go b/java/droiddoc.go index cf7f4fb5d..da8489ac1 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1050,7 +1050,8 @@ func (d *Droidstubs) OutputFiles(tag string) (android.Paths, error) { return android.Paths{d.stubsSrcJar}, nil case ".docs.zip": return android.Paths{d.docZip}, nil - case ".api.txt": + case ".api.txt", android.DefaultDistTag: + // This is the default dist path for dist properties that have no tag property. return android.Paths{d.apiFilePath}, nil case ".removed-api.txt": return android.Paths{d.removedApiFilePath}, nil