Updated scripts, fixed a bug which was causing Illegal Instruction er…

…ror in some arm devices
sun363587351 · Sep 19, 2014 · 1b2069e · 1b2069e
1 parent 1cd145b
commit 1b2069e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/abi_settings.sh b/abi_settings.sh
@@ -9,13 +9,12 @@ case $1 in
     NDK_ABI='arm'
     NDK_TOOLCHAIN_ABI='arm-linux-androideabi'
     NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}"
-    CFLAGS="$CFLAGS -march=armv7-a"
   ;;
   armeabi-v7a-neon)
     NDK_ABI='arm'
     NDK_TOOLCHAIN_ABI='arm-linux-androideabi'
     NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}"
-    CFLAGS="$CFLAGS -march=armv7-a -mfpu=neon"
+    CFLAGS="${CFLAGS} -mfpu=neon"
   ;;
   x86)
     NDK_ABI='x86'

diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
@@ -5,8 +5,8 @@
 pushd ffmpeg
 
 case $1 in
-  armeabi-v7a | armeabi-v7a-neon )
-    CPU='armv7-a'
+  armeabi-v7a | armeabi-v7a-neon)
+    CPU='cortex-a8'
   ;;
   x86)
     CPU='i686'

diff --git a/libpng_build.sh b/libpng_build.sh
diff --git a/x264_build.sh b/x264_build.sh
@@ -22,6 +22,7 @@ echo $CFLAGS
   --sysroot="$NDK_SYSROOT" \
   --host="$HOST" \
   --enable-pic \
+  --disable-asm \
   --enable-static \
   --disable-shared \
   --prefix="${TOOLCHAIN_PREFIX}" \