Merge "Fix droiddoc disting when WITHOUT_CHECK_API is true." am: fc16b6684e (46b6b40c) · Commits · e / os / android_build_soong

android/androidmk.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -183,12 +183,15 @@ func (a *AndroidMkEntries) GetDistForGoals(mod blueprint.Module) []string {
		name := amod.BaseModuleName()

		var ret []string
		var availableTaggedDists TaggedDistFiles

		availableTaggedDists := TaggedDistFiles{}
		if a.DistFiles != nil {
		availableTaggedDists = a.DistFiles
		} else if a.OutputFile.Valid() {
		availableTaggedDists = MakeDefaultDistFiles(a.OutputFile.Path())
		} else {
		// Nothing dist-able for this module.
		return nil
		}

		// Iterate over this module's dist structs, merged from the dist and dists properties.

+6 −0

Original line number	Diff line number	Diff line
		@@ -569,6 +569,12 @@ type commonProperties struct {
		type TaggedDistFiles map[string]Paths

		func MakeDefaultDistFiles(paths ...Path) TaggedDistFiles {
		for _, path := range paths {
		if path == nil {
		panic("The path to a dist file cannot be nil.")
		}
		}

		// The default OutputFile tag is the empty "" string.
		return TaggedDistFiles{"": paths}
		}

+9 −3

Original line number	Diff line number	Diff line
		@@ -559,15 +559,21 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries {
		// are created in make if only the api txt file is being generated. This is
		// needed because an invalid output file would prevent the make entries from
		// being written.
		//
		// 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.
		distFile := dstubs.apiFile

		var distFiles android.TaggedDistFiles
		if dstubs.apiFile != nil {
		distFiles = android.MakeDefaultDistFiles(dstubs.apiFile)
		}
		outputFile := android.OptionalPathForPath(dstubs.stubsSrcJar)
		if !outputFile.Valid() {
		outputFile = android.OptionalPathForPath(distFile)
		outputFile = android.OptionalPathForPath(dstubs.apiFile)
		}
		return []android.AndroidMkEntries{android.AndroidMkEntries{
		Class: "JAVA_LIBRARIES",
		DistFiles: android.MakeDefaultDistFiles(distFile),
		DistFiles: distFiles,
		OutputFile: outputFile,
		Include: "$(BUILD_SYSTEM)/soong_droiddoc_prebuilt.mk",
		ExtraEntries: []android.AndroidMkExtraEntriesFunc{