Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8aed4b2 authored Nov 26, 2020 by Paul Duffin

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

parent fdea2578

java/androidmk.go

+0 −5

Original line number	Diff line number	Diff line
		@@ -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{

java/droiddoc.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -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