[Android] compile.sh: Remove hack to move files around in a tmp folder

Hugo Beauzée-Luyssen git at videolan.org
Thu Jan 6 13:11:10 UTC 2022


vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Nov 26 16:25:10 2021 +0100| [da0163725f2b2fd89bdaacbf6b787a4a0abfa778] | committer: Nicolas Pomepuy

compile.sh: Remove hack to move files around in a tmp folder

> https://code.videolan.org/videolan/vlc-android/commit/da0163725f2b2fd89bdaacbf6b787a4a0abfa778
---

 buildsystem/compile.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index effd2b25a..9cade0609 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -328,8 +328,6 @@ fi
 diagnostic "Configuring"
 compile() {
     # Build LibVLC if asked for it, or needed by medialibrary
-    copy_tmp="$1"
-
     OUT_DBG_DIR=.dbg/${ANDROID_ABI}
     mkdir -p $OUT_DBG_DIR
 
@@ -337,19 +335,11 @@ compile() {
         AVLC_SOURCED=1 . buildsystem/compile-libvlc.sh
         avlc_build
 
-        if [ "$copy_tmp" = "--copy-tmp=libvlc" ];then
-            cp -r $VLC_OUT_PATH/libs/${ANDROID_ABI} libvlc/jni/libs/${ANDROID_ABI} build/tmp
-        fi
-
         cp -a ./libvlc/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
     fi
 
     if [ "$NO_ML" != 1 ]; then
         ANDROID_ABI=$ANDROID_ABI RELEASE=$RELEASE buildsystem/compile-medialibrary.sh
-        if [ "$copy_tmp" = "--copy-tmp=medialibrary" ];then
-            cp -r medialibrary/jni/libs/${ANDROID_ABI} build/tmp
-        fi
-
         cp -a medialibrary/jni/obj/local/${ANDROID_ABI}/*.so ${OUT_DBG_DIR}
     fi
 }



More information about the Android mailing list