[Android] build: remove ASAN flag

Thomas Guillem git at videolan.org
Tue May 14 16:47:19 CEST 2019


vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon May 13 14:03:54 2019 +0200| [2a22789233197f53d9f71450ee5d1d526691998a] | committer: Thomas Guillem

build: remove ASAN flag

Not supported anymore.

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

 build-common            | 6 ------
 compile-libvlc.sh       | 7 -------
 compile-medialibrary.sh | 4 ----
 compile.sh              | 6 ------
 4 files changed, 23 deletions(-)

diff --git a/build-common b/build-common
index c42568aa9..f8909c252 100755
--- a/build-common
+++ b/build-common
@@ -165,12 +165,6 @@ else
     NDK_DEBUG=1
 fi
 
-if [ "${ASAN}" = 1 ];then
-    VLC_CFLAGS="${VLC_CFLAGS} -O0 -fno-omit-frame-pointer -fsanitize=address"
-    VLC_CXXFLAGS="${VLC_CXXFLAGS} -O0 -fno-omit-frame-pointer -fsanitize=address"
-    VLC_LDFLAGS="${VLC_LDFLAGS} -ldl -fsanitize=address"
-fi
-
 ###############
 # DISPLAY ABI #
 ###############
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 977996c2d..6fda72092 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -17,7 +17,6 @@ checkfail()
 #############
 
 RELEASE=0
-ASAN=0
 while [ $# -gt 0 ]; do
     case $1 in
         help|--help)
@@ -32,9 +31,6 @@ while [ $# -gt 0 ]; do
         -c)
             CHROME_OS=1
             ;;
-        --asan)
-            ASAN=1
-            ;;
         release|--release)
             RELEASE=1
             ;;
@@ -328,9 +324,6 @@ if [ "${CHROME_OS}" = "1" ];then
 else
     VLC_BUILD_DIR=build-android-${TARGET_TUPLE}
 fi
-if [ "${ASAN}" = 1 ];then
-    VLC_BUILD_DIR=${VLC_BUILD_DIR}-asan
-fi
 VLC_BUILD_DIR=`realpath ${VLC_BUILD_DIR}`
 mkdir -p $VLC_BUILD_DIR && cd $VLC_BUILD_DIR
 
diff --git a/compile-medialibrary.sh b/compile-medialibrary.sh
index 32d91ce7e..7ccc4fba3 100755
--- a/compile-medialibrary.sh
+++ b/compile-medialibrary.sh
@@ -19,7 +19,6 @@ checkfail()
 MEDIALIBRARY_HASH=c4a1c6e
 
 RELEASE=0
-ASAN=0
 while [ $# -gt 0 ]; do
     case $1 in
         help|--help)
@@ -31,9 +30,6 @@ while [ $# -gt 0 ]; do
             ANDROID_ABI=$2
             shift
             ;;
-        --asan)
-            ASAN=1
-            ;;
         release|--release)
             RELEASE=1
             ;;
diff --git a/compile.sh b/compile.sh
index 095290c67..4180e8ba8 100755
--- a/compile.sh
+++ b/compile.sh
@@ -65,9 +65,6 @@ while [ $# -gt 0 ]; do
         run)
             RUN=1
             ;;
-        --asan)
-            ASAN=1
-            ;;
         --no-ml)
             NO_ML=1
             ;;
@@ -274,9 +271,6 @@ compile() {
     if [ "$CHROME_OS" = 1 ]; then
         OPTS="$OPTS -c"
     fi
-    if [ "$ASAN" = 1 ]; then
-        OPTS="$OPTS --asan"
-    fi
 
     # Build LibVLC if asked for it, or needed by medialibrary
     if [ "$BUILD_MEDIALIB" != 1 -o ! -d "libvlc/jni/libs/$1" ]; then



More information about the Android mailing list