tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I02fb745a,Iccc96c0d

Browse source 
* changes:
  Follow all shared library dependencies when collecting JNI libraries
  Handle static unwinder in ltoDepsMutator
This commit is contained in:
Colin Cross 2020-08-13 21:55:53 +00:00 committed by Gerrit Code Review
commit a24b9deb5f
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/cc.go
View file

@ -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 {

4
cc/lto.go
View file

@ -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 {

4
java/app.go
View file

@ -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