ref: 3a6f51781da6a6e6f18e7edfc5023b0793b013d2
parent: 5b004048ed394bc0318f8cfa7ab4a9055aa3f8eb
parent: a01d6812edcb72844ffc05a4bb3a65aba526ea63
author: zhilwang <[email protected]>
date: Tue Jul 1 11:31:22 EDT 2014
Merge pull request #1044 from mstorsjo/android-cleanup-compiler-flags Simplify the compiler flags for the android test projects
--- a/codec/build/android/dec/jni/welsdecdemo.mk
+++ b/codec/build/android/dec/jni/welsdecdemo.mk
@@ -39,11 +39,7 @@
#
# Compile Flags and Link Libraries
#
-LOCAL_CFLAGS := -O3 -DANDROID_NDK
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_ARM_MODE := arm
-endif
+LOCAL_CFLAGS := -DANDROID_NDK
LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := wels
--- a/codec/build/android/enc/jni/welsencdemo.mk
+++ b/codec/build/android/enc/jni/welsencdemo.mk
@@ -43,11 +43,7 @@
#
# Compile Flags and Link Libraries
#
-LOCAL_CFLAGS := -O3 -DANDROID_NDK
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_ARM_MODE := arm
-endif
+LOCAL_CFLAGS := -DANDROID_NDK
LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := wels
--- a/test/build/android/jni/Android.mk
+++ b/test/build/android/jni/Android.mk
@@ -30,11 +30,7 @@
#
# Compile Flags and Link Libraries
#
-LOCAL_CFLAGS := -O3 -DANDROID_NDK
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_ARM_MODE := arm
-endif
+LOCAL_CFLAGS := -DANDROID_NDK
LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := libUT