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

Commit a24b9deb authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I02fb745a,Iccc96c0d 

* changes:
  Follow all shared library dependencies when collecting JNI libraries
  Handle static unwinder in ltoDepsMutator
parents 61ca6a39 f0913fb0

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ func (c *Module) isCoverageVariant() bool { 
}



func (c *Module) IsNdk() bool {

	return inList(c.Name(), ndkKnownLibs)

	return inList(c.BaseModuleName(), ndkKnownLibs)

}



func (c *Module) isLlndk(config android.Config) bool {

cc/lto.go

+1 −3
Original line number Diff line number Diff line
@@ -152,9 +152,7 @@ func ltoDepsMutator(mctx android.TopDownMutatorContext) { 


			// Do not recurse down non-static dependencies

			if isLibTag {

				// TODO(ccross): the staticUnwinder check is there to maintain existing behavior

				//   when adding libraryDependencyTag and should be removed.

				if !libTag.static() || libTag.staticUnwinder {

				if !libTag.static() {

					return false

				}

			} else {

java/app.go

+1 −3
Original line number Diff line number Diff line
@@ -845,9 +845,7 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface, 
		otherName := ctx.OtherModuleName(module)

		tag := ctx.OtherModuleDependencyTag(module)



		// TODO(ccross): The tag == cc.SharedDepTag() check should be cc.IsSharedDepTag(tag) but

		//   was left to maintain behavior when adding libraryDependencyTag.

		if IsJniDepTag(tag) || tag == cc.SharedDepTag() {

		if IsJniDepTag(tag) || cc.IsSharedDepTag(tag) {

			if dep, ok := module.(*cc.Module); ok {

				if dep.IsNdk() || dep.IsStubs() {

					return false