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

Commit be7c1848 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topics "libz-no-stubs-for-vendor",... 

Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3 am: e4be5409 am: d43082e6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092



Change-Id: Ifae51dddd8ccaf4886e79fb4f264d6b54e129628
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1c9cb14 d43082e6

cc/stub_library.go

+8 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ func init() { 


type stubLibraries struct {

	stubLibraryMap       map[string]bool

	stubVendorLibraryMap map[string]bool



	apiListCoverageXmlPaths []string

}
@@ -54,6 +55,9 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) { 
			if IsStubTarget(m) {

				if name := getInstalledFileName(m); name != "" {

					s.stubLibraryMap[name] = true

					if m.InVendor() {

						s.stubVendorLibraryMap[name] = true

					}

				}

			}

			if m.library != nil {
@@ -68,12 +72,14 @@ func (s *stubLibraries) GenerateBuildActions(ctx android.SingletonContext) { 
func stubLibrariesSingleton() android.Singleton {

	return &stubLibraries{

		stubLibraryMap:       make(map[string]bool),

		stubVendorLibraryMap: make(map[string]bool),

	}

}



func (s *stubLibraries) MakeVars(ctx android.MakeVarsContext) {

	// Convert stub library file names into Makefile variable.

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

	ctx.Strict("SOONG_STUB_VENDOR_LIBRARIES", strings.Join(android.SortedKeys(s.stubVendorLibraryMap), " "))



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

	sort.Strings(s.apiListCoverageXmlPaths)