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

Commit 2cec05d3 authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Export SOONG_CC_API_XML to Make outside androidmk" 

This reverts commit ebb32c48.

Reason for revert: breaks coverage build (b/201600003)
Bug: 193819970
Bug: 201600003

Change-Id: I65969c4a62165c40dded2794b757469909bf8ca6
parent ebb32c48

cc/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -294,6 +294,9 @@ func (library *libraryDecorator) AndroidMkEntries(ctx AndroidMkContext, entries 
			if library.buildStubs() {

				entries.SetBool("LOCAL_NO_NOTICE_FILE", true)

			}

			if library.apiListCoverageXmlPath.String() != "" {

				entries.SetString("SOONG_CC_API_XML", "$(SOONG_CC_API_XML) "+library.apiListCoverageXmlPath.String())

			}

		})

	}

	// If a library providing a stub is included in an APEX, the private APIs of the library

cc/library.go

+0 −6
Original line number Diff line number Diff line
@@ -1035,8 +1035,6 @@ type libraryInterface interface { 
	androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer)



	availableFor(string) bool



	getAPIListCoverageXMLPath() android.ModuleOutPath

}



type versionedInterface interface {
@@ -1973,10 +1971,6 @@ func (library *libraryDecorator) makeUninstallable(mod *Module) { 
	mod.ModuleBase.MakeUninstallable()

}



func (library *libraryDecorator) getAPIListCoverageXMLPath() android.ModuleOutPath {

	return library.apiListCoverageXmlPath

}



var versioningMacroNamesListKey = android.NewOnceKey("versioningMacroNamesList")



// versioningMacroNamesList returns a singleton map, where keys are "version macro names",

cc/stub_library.go

+0 −12
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
package cc



import (

	"sort"

	"strings"



	"android/soong/android"
@@ -28,8 +27,6 @@ func init() { 


type stubLibraries struct {

	stubLibraryMap map[string]bool



	apiListCoverageXmlPaths []string

}



// Check if the module defines stub, or itself is stub
@@ -56,11 +53,6 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) { 
					s.stubLibraryMap[name] = true

				}

			}

			if m.library != nil {

				if p := m.library.getAPIListCoverageXMLPath().String(); p != "" {

					s.apiListCoverageXmlPaths = append(s.apiListCoverageXmlPaths, p)

				}

			}

		}

	})

}
@@ -74,8 +66,4 @@ func stubLibrariesSingleton() android.Singleton { 
func (s *stubLibraries) MakeVars(ctx android.MakeVarsContext) {

	// Convert stub library file names into Makefile variable.

	ctx.Strict("STUB_LIBRARIES", strings.Join(android.SortedStringKeys(s.stubLibraryMap), " "))



	// Export the list of API XML files to Make.

	sort.Strings(s.apiListCoverageXmlPaths)

	ctx.Strict("SOONG_CC_API_XML", strings.Join(s.apiListCoverageXmlPaths, " "))

}