Platform lib fixes and improvements (#925)

* Build platform klibs with `-nodefaultlibs`

* Improve android platform libs:

* Add dependencies
* Add header filters
* Add glescommon
* Do minor cleanup

* Add minor code improvements
This commit is contained in:
SvyatoslavScherbina
2017-10-10 11:41:52 +03:00
committed by Nikolay Igotti
parent 5eed839f91
commit 8bc552632d
14 changed files with 47 additions and 20 deletions
@@ -43,7 +43,7 @@ fun SearchPathResolver.resolveImmediateLibraries(libraryNames: List<String>,
noDefaultLibs: Boolean = false,
removeDuplicates: Boolean = true): List<LibraryReaderImpl> {
val defaultLibraries = defaultLinks(noStdLib, noDefaultLibs).map {
val defaultLibraries = defaultLinks(nostdlib = noStdLib, noDefaultLibs = noDefaultLibs).map {
LibraryReaderImpl(it, abiVersion, target, isDefaultLink = true)
}
@@ -82,7 +82,14 @@ fun SearchPathResolver.resolveLibrariesRecursive(libraryNames: List<String>,
noStdLib: Boolean = false,
noDefaultLibs: Boolean = false): List<LibraryReaderImpl> {
return resolveLibrariesRecursive(
resolveImmediateLibraries(libraryNames, target, abiVersion, noStdLib, noDefaultLibs, true),
resolveImmediateLibraries(
libraryNames = libraryNames,
target = target,
abiVersion = abiVersion,
noStdLib = noStdLib,
noDefaultLibs = noDefaultLibs,
removeDuplicates = true
),
target, abiVersion
)
}