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

Commit f0913fb0 authored by Colin Cross's avatar Colin Cross
Browse files

Follow all shared library dependencies when collecting JNI libraries 

The implementation before libraryDependencyTag was added failed to
include some JNI libraries into apps because it did not handle
sharedExportDepTag, earlySharedDepTag or lateSharedDepTag.

Also fix a bug in cc.*Module.IsNdk that was comparing "liblog.ndk"
against "liblog" and incorrectly returning false that would have
caused NDK libraries that now pass the check above to incorrectly be
packaged into the APK.

Bug: 162437057
Test: m checkbuild
Change-Id: I02fb745abb5cace2b4e5bfff2f35cef6d2e0a4ff
parent 4fbb5e02

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,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 {

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