Skip to content

Commit febc162

Browse files
Mike KleinSkia Commit-Bot
authored andcommitted
ndk r20 compat.
Something's trying to link libc++.so by default, so ask it to link libc++.a with -static-libstdc++. Either way, the linker can't find libc++ without adding another library directory path. I think both changes should be harmlessly ignored before r20. Change-Id: I5b67e1dcb8b40548dae5a8300151e4392ae551f9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225436 Auto-Submit: Mike Klein <[email protected]> Reviewed-by: Derek Sollenberger <[email protected]> Commit-Queue: Derek Sollenberger <[email protected]> Commit-Queue: Mike Klein <[email protected]>
1 parent 49c9690 commit febc162

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

‎gn/BUILD.gn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,12 @@ config("default") {
169169
"--sysroot=$ndk/platforms/$ndk_platform",
170170
"--target=$ndk_target",
171171
"-B$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/$ndk_target/bin",
172+
"-static-libstdc++",
172173
]
173174
lib_dirs = [
174175
"$ndk/sources/cxx-stl/llvm-libc++/libs/$ndk_stdlib",
175176
"$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/lib/gcc/$ndk_target/4.9.x",
177+
"$ndk/toolchains/llvm/prebuilt/$ndk_host/sysroot/usr/lib/$ndk_target/$ndk_api",
176178
]
177179

178180
libs += [

0 commit comments

Comments
 (0)