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

Merge "Add libraryDependencyTag to track dependencies on static and shared libraries" am: 2eddd06879 am: f6c453a3fd

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

Change-Id: I20996cc0ed388013f24966a2d8a9462177bfe45e
This commit is contained in:
Colin Cross
2020-08-06 13:12:06 +00:00
committed by Automerger Merge Worker
parent 6ebeb3e0bd f6c453a3fd
commit 7f034dabf1
12 changed files with 465 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/app.go
View File

@@ -875,7 +875,9 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface,
otherName := ctx.OtherModuleName(module)
tag := ctx.OtherModuleDependencyTag(module)
if IsJniDepTag(tag) || tag == cc.SharedDepTag {
// 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 dep, ok := module.(*cc.Module); ok {
if dep.IsNdk() || dep.IsStubs() {
return false