diff options
| author | 2020-11-26 00:26:42 +0000 | |
|---|---|---|
| committer | 2020-11-30 17:20:09 +0000 | |
| commit | d8aed4b275ddc68b7ca84dda3fe7df1765ffe23b (patch) | |
| tree | 77c3206b8a56204dcefb7ab2f59a463b0cec5abd /java/androidmk.go | |
| parent | fdea25781f72a2f15fdad0bacc633a6c8f255fec (diff) | |
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
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 5 |
1 files changed, 0 insertions, 5 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{ |