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

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

Merge changes from topic "tvts-test-host-jni" 

* changes:
  Add jni_libs property to java tests
  Add Target to cc.SharedLibraryInfo
parents 7d9d2405 246164a0

cc/library.go

+1 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,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
@@ -209,6 +209,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
@@ -591,6 +591,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,

		})