From 1cd145b8a95ffa3caff8e085ed9d4d22b64df3c9 Mon Sep 17 00:00:00 2001
From: Hitesh Sondhi <hiteshsondhi88@gmail.com>
Date: Thu, 18 Sep 2014 01:05:44 +0530
Subject: [PATCH] Removed CFLAG_LIBS

---
 abi_settings.sh | 3 ---
 settings.sh     | 1 -
 2 files changed, 4 deletions(-)

diff --git a/abi_settings.sh b/abi_settings.sh
index 590aa8e..8900011 100755
--- a/abi_settings.sh
+++ b/abi_settings.sh
@@ -10,21 +10,18 @@ case $1 in
     NDK_TOOLCHAIN_ABI='arm-linux-androideabi'
     NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}"
     CFLAGS="$CFLAGS -march=armv7-a"
-    CFLAGS_LIBS="$CFLAGS_LIBS -mcpu=cortex-a8 -marm -mfloat-abi=softfp"
   ;;
   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_LIBS="$CFLAGS_LIBS -mcpu=cortex-a8 -marm -mfloat-abi=softfp -mfpu=neon"
   ;;
   x86)
     NDK_ABI='x86'
     NDK_TOOLCHAIN_ABI='x86'
     NDK_CROSS_PREFIX="i686-linux-android"
     CFLAGS="$CFLAGS -march=i686"
-    CFLAGS_LIBS="$CFLAGS_LIBS -march=i686"
   ;;
 esac
 
diff --git a/settings.sh b/settings.sh
index 5a1698e..bdf7b94 100755
--- a/settings.sh
+++ b/settings.sh
@@ -16,5 +16,4 @@ TARGET_OS=linux
 CFLAGS='-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all'
 LDFLAGS='-Wl,-z,relro -Wl,-z,now -pie'
 
-CFLAGS_LIBS="-std=gnu99"
 FFMPEG_PKG_CONFIG="$(pwd)/ffmpeg-pkg-config"