Fix workground:

- fix applying patch
- fix ld path
- fix removing package
- fix errors on first links update
- remove unused files

1 files changed, 4 insertions, 1 deletions

diff --git a/update_links.sh b/update_links.sh
index aca43d758d07..1a0dd740afd3 100755
--- a/update_links.sh
+++ b/update_links.sh
@@ -13,7 +13,7 @@ processPath(){
         return
     fi
     echo "Update path for ${OLLVM_PATH}/$1 -> ${ANDROID_NDK}/$ndk_path"
-    rm "${OLLVM_PATH}/$1"
+    rm -f "${OLLVM_PATH}/$1"
     ln -s "${ANDROID_NDK}/$ndk_path" "${OLLVM_PATH}/$1"
 }
 
@@ -24,3 +24,6 @@ processPath "toolchains/llvm/prebuilt/linux-x86_64/sysroot"
 ollvm_ver=`${OLLVM_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --version | head -1 | awk {'print $3'}`
 andllvm_ver=`${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --version | head -1 | awk {'print $8'}`
 processPath "toolchains/llvm/prebuilt/linux-x86_64/lib/clang/${ollvm_ver}/lib" "toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/${andllvm_ver}/lib"
+
+rm -f "${OLLVM_PATH}/toolchains/llvm/prebuilt/linux-x86_64/ndk-libs"
+ln -s "${OLLVM_PATH}/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/${ollvm_ver}/lib" "${OLLVM_PATH}/toolchains/llvm/prebuilt/linux-x86_64/ndk-libs"