[KT-40508] Respect libraryPaths in metadata interop

This commit is contained in:
Sergey Bogolepov
2020-07-29 20:00:10 +07:00
committed by Sergey Bogolepov
parent e8845c29fe
commit a7e3c5ca2a
3 changed files with 5 additions and 6 deletions
@@ -378,7 +378,7 @@ private fun processCLib(flavorName: String, cinteropArguments: CInteropArguments
dependencies = stdlibDependency + imports.requiredLibraries.toList(),
nopack = cinteropArguments.nopack,
shortName = cinteropArguments.shortModuleName,
staticLibraries = staticLibraries
staticLibraries = resolveLibraries(staticLibraries, libraryPaths)
)
return null
}
+2 -2
View File
@@ -3576,8 +3576,8 @@ createInterop("embedStaticLibraries") {
}
}
it.extraOpts '-staticLibrary', "$libDir/1.a"
it.extraOpts '-staticLibrary', "$libDir/2.a"
it.extraOpts '-staticLibrary', "1.a"
it.extraOpts '-staticLibrary', "2.a"
}
if (PlatformInfo.isAppleTarget(project)) {
@@ -1,3 +1,2 @@
staticLibraries = \
backend.native/tests/build/embedStaticLibraries/3.a \
backend.native/tests/build/embedStaticLibraries/4.a
libraryPaths = backend.native/tests/build/embedStaticLibraries
staticLibraries = 3.a 4.a