Merge "rust: Allow rust_ffi_shared in jni_libs" am: 3742d6ad9e
am: b3123979d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2136889 Change-Id: I9d08e2ed4e64ea9c8b4ef12cbeac10f46c776109 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -749,7 +749,7 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface,
|
||||
tag := ctx.OtherModuleDependencyTag(module)
|
||||
|
||||
if IsJniDepTag(tag) || cc.IsSharedDepTag(tag) {
|
||||
if dep, ok := module.(*cc.Module); ok {
|
||||
if dep, ok := module.(cc.LinkableInterface); ok {
|
||||
if dep.IsNdk(ctx.Config()) || dep.IsStubs() {
|
||||
return false
|
||||
}
|
||||
|
Reference in New Issue
Block a user