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

Commit 2f53f61d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "droidstubs: Remove unnecessary setting of DistFiles"

parents fd9fdec1 d8aed4b2

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