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

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

Add Target to cc.SharedLibraryInfo 

Dependencies from common arch modules like java libraires to cc modules
may need to retrieve the Target of the library, add it to
SharedLibraryInfo.

Bug: 176593487
Test: cc_test.go
Change-Id: I93ab9da5fab2ccc42c6b483a6d83c071b541d1e6
parent e09ac174

cc/library.go

+1 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, 
		UnstrippedSharedLibrary: library.unstrippedOutputFile,

		CoverageSharedLibrary:   library.coverageOutputFile,

		StaticAnalogue:          staticAnalogue,

		Target:                  ctx.Target(),

	})



	stubs := ctx.GetDirectDepsWithTag(stubImplDepTag)

cc/linkable.go

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ func HeaderDepTag() blueprint.DependencyTag { 
type SharedLibraryInfo struct {

	SharedLibrary           android.Path

	UnstrippedSharedLibrary android.Path

	Target                  android.Target



	TableOfContents       android.OptionalPath

	CoverageSharedLibrary android.OptionalPath

cc/ndk_prebuilt.go

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ func (ndk *ndkPrebuiltStlLinker) link(ctx ModuleContext, flags Flags, 
		ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{

			SharedLibrary:           lib,

			UnstrippedSharedLibrary: lib,

			Target:                  ctx.Target(),

		})

	}

cc/prebuilt.go

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, 
			ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{

				SharedLibrary:           outputFile,

				UnstrippedSharedLibrary: p.unstrippedOutputFile,

				Target:                  ctx.Target(),



				TableOfContents: p.tocFile,

			})

cc/snapshot_prebuilt.go

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ func (p *snapshotLibraryDecorator) link(ctx ModuleContext, flags Flags, deps Pat 
		ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{

			SharedLibrary:           in,

			UnstrippedSharedLibrary: p.unstrippedOutputFile,

			Target:                  ctx.Target(),



			TableOfContents: p.tocFile,

		})