android: remove duplicated build target

bbcallen · Jun 24, 2014 · 730d8c5 · 730d8c5
1 parent aa676a4
commit 730d8c5
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 215 deletions.
diff --git a/android/compile-ijk.sh b/android/compile-ijk.sh
@@ -4,10 +4,6 @@ cd ijkmediaplayer/jni
 ndk-build
 cd -
 
-cd ijkmediaplayer-armv7a/jni
-ndk-build
-cd -
-
 cd ijkmediaplayer-armv5/jni
 ndk-build
 cd -

diff --git a/android/ijkmediaplayer-armv7a/.classpath b/android/ijkmediaplayer-armv7a/.classpath
diff --git a/android/ijkmediaplayer-armv7a/.project b/android/ijkmediaplayer-armv7a/.project
diff --git a/android/ijkmediaplayer-armv7a/AndroidManifest.xml b/android/ijkmediaplayer-armv7a/AndroidManifest.xml
diff --git a/android/ijkmediaplayer-armv7a/build.xml b/android/ijkmediaplayer-armv7a/build.xml
diff --git a/android/ijkmediaplayer-armv7a/jni/Android.mk b/android/ijkmediaplayer-armv7a/jni/Android.mk
diff --git a/android/ijkmediaplayer-armv7a/jni/Application.mk b/android/ijkmediaplayer-armv7a/jni/Application.mk
diff --git a/android/ijkmediaplayer-armv7a/jni/ffmpeg b/android/ijkmediaplayer-armv7a/jni/ffmpeg
diff --git a/android/ijkmediaplayer-armv7a/jni/ijkmedia b/android/ijkmediaplayer-armv7a/jni/ijkmedia
diff --git a/android/ijkmediaplayer-armv7a/proguard-project.txt b/android/ijkmediaplayer-armv7a/proguard-project.txt
diff --git a/android/ijkmediaplayer-armv7a/project.properties b/android/ijkmediaplayer-armv7a/project.properties
diff --git a/android/ijkmediaplayer/jni/Application.mk b/android/ijkmediaplayer/jni/Application.mk
@@ -18,7 +18,7 @@
 
 APP_OPTIM := release
 APP_PLATFORM := android-9
-APP_ABI := armeabi-v7a armeabi x86
+APP_ABI := armeabi-v7a
 NDK_TOOLCHAIN_VERSION=4.8
 APP_PIE := false
 APP_STL := stlport_shared