diff --git a/ndk_script/adapter/libc.ndk.json b/ndk_script/adapter/libc.ndk.json index a020ebcabe3d8c3d869dc1a92ac3115280506c5e..69952c5f96433d01ef11e00265468b45f341e97c 100644 --- a/ndk_script/adapter/libc.ndk.json +++ b/ndk_script/adapter/libc.ndk.json @@ -891,7 +891,6 @@ { "name": "pthread_getcpuclockid" }, { "name": "pthread_getschedparam" }, { "name": "pthread_getspecific" }, - { "name": "pthread_gettid" }, { "name": "pthread_gettid_np" }, { "name": "pthread_join" }, { "name": "pthread_key_create" }, @@ -1419,4 +1418,4 @@ { "name": "stdout", "type": "variable" }, { "name": "timezone", "type": "variable" }, { "name": "tzname", "type": "variable" } -] \ No newline at end of file +] diff --git a/ndk_script/toolchain.sh b/ndk_script/toolchain.sh index e3bf2a6c495e4eb5ad73d057db1a900c23d6bd91..836ceb70f5d6839ef722315d77c14d7c93dfdd91 100755 --- a/ndk_script/toolchain.sh +++ b/ndk_script/toolchain.sh @@ -26,8 +26,8 @@ ndk_dir=$(ls ${SOURCE_DIR}/lib/|more |awk '{print $NF}') for i in $ndk_dir do - find ${OUT_DIR}/lib/$i -name 'libc++.a' -exec rm -f {} \; - find ${OUT_DIR}/lib/$i -name 'libc++.so' -exec rm -f {} \; + find ${OUT_DIR}/lib/$i -name 'libc++.a' -type f -exec bash -c 'echo "INPUT(-lc++_static -lc++abi)" > $1' _ {} \; + find ${OUT_DIR}/lib/$i -name 'libc++.so' -type f -exec bash -c 'echo "INPUT(-lc++_shared)" > $1' _ {} \; done cp -rfp ${SOURCE_DIR}/lib ${OUT_DIR}