StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I02fb745a,Iccc96c0d am: a24b9deb5f am: 094956cf00

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1378536

Change-Id: I8a434610d1869e30a853208d974a16196aa9e884
This commit is contained in:
Colin Cross
2020-08-13 22:28:35 +00:00
committed by Automerger Merge Worker
parent 1a8b250a3c 094956cf00
commit e3b91dc7fb
3 changed files with 3 additions and 7 deletions
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 { func (c *Module) IsNdk() bool {
return inList(c.Name(), ndkKnownLibs) return inList(c.BaseModuleName(), ndkKnownLibs)
} }
func (c *Module) isLlndk(config android.Config) bool { 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 // Do not recurse down non-static dependencies
if isLibTag { if isLibTag {
// TODO(ccross): the staticUnwinder check is there to maintain existing behavior if !libTag.static() {
// when adding libraryDependencyTag and should be removed.
if !libTag.static() || libTag.staticUnwinder {
return false return false
} }
} else { } else {

4
java/app.go
View File

@@ -875,9 +875,7 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface,
otherName := ctx.OtherModuleName(module) otherName := ctx.OtherModuleName(module)
tag := ctx.OtherModuleDependencyTag(module) tag := ctx.OtherModuleDependencyTag(module)
// TODO(ccross): The tag == cc.SharedDepTag() check should be cc.IsSharedDepTag(tag) but if IsJniDepTag(tag) || cc.IsSharedDepTag(tag) {
// was left to maintain behavior when adding libraryDependencyTag.
if IsJniDepTag(tag) || tag == cc.SharedDepTag() {
if dep, ok := module.(*cc.Module); ok { if dep, ok := module.(*cc.Module); ok {
if dep.IsNdk() || dep.IsStubs() { if dep.IsNdk() || dep.IsStubs() {
return false return false