diff --git a/android/compile-ijk.sh b/android/compile-ijk.sh index 34c949197a9ed6cc7f0943376d9f1886d2be6339..03c02375cebac66f0baf8752b98f03f8574be8ae 100755 --- 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 deleted file mode 100644 index 7bc01d9a9c6873b7e4fea3b29ee945267845ae86..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/android/ijkmediaplayer-armv7a/.project b/android/ijkmediaplayer-armv7a/.project deleted file mode 100644 index c6c26689857f3917deef96fa68b9300abbbf064a..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - ijkmediaplayer-armv7a - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/android/ijkmediaplayer-armv7a/AndroidManifest.xml b/android/ijkmediaplayer-armv7a/AndroidManifest.xml deleted file mode 100644 index f3790cbf6ee52433b3c17e4324d9e11c28b212a2..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/ijkmediaplayer-armv7a/build.xml b/android/ijkmediaplayer-armv7a/build.xml deleted file mode 100644 index 0c2ab586e71b194b5dbf01f17e584b97a8f0d447..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/ijkmediaplayer-armv7a/jni/Android.mk b/android/ijkmediaplayer-armv7a/jni/Android.mk deleted file mode 120000 index fe0a0ae4ba6ef8fed34826fad270f92946649b97..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/jni/Android.mk +++ /dev/null @@ -1 +0,0 @@ -../../ijkmediaplayer/jni/Android.mk \ No newline at end of file diff --git a/android/ijkmediaplayer-armv7a/jni/Application.mk b/android/ijkmediaplayer-armv7a/jni/Application.mk deleted file mode 100644 index 47c0de9fdbc3eb17f5b6f6bb24fd1daeebcac2d3..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/jni/Application.mk +++ /dev/null @@ -1,30 +0,0 @@ -# copyright (c) 2013-2014 Zhang Rui -# -# This file is part of ijkPlayer. -# -# ijkPlayer is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# ijkPlayer is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with ijkPlayer; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -APP_OPTIM := release -APP_PLATFORM := android-9 -APP_ABI := armeabi-v7a -NDK_TOOLCHAIN_VERSION=4.8 -APP_PIE := false -APP_STL := stlport_shared - -APP_CFLAGS := -O3 -Wall -pipe \ - -ffast-math \ - -fstrict-aliasing -Werror=strict-aliasing \ - -Wno-psabi -Wa,--noexecstack \ - -DANDROID -DNDEBUG diff --git a/android/ijkmediaplayer-armv7a/jni/ffmpeg b/android/ijkmediaplayer-armv7a/jni/ffmpeg deleted file mode 120000 index d4ccfb5c1538e30a51ff40eb55cb73781defc87a..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/jni/ffmpeg +++ /dev/null @@ -1 +0,0 @@ -../../ijkmediaplayer/jni/ffmpeg \ No newline at end of file diff --git a/android/ijkmediaplayer-armv7a/jni/ijkmedia b/android/ijkmediaplayer-armv7a/jni/ijkmedia deleted file mode 120000 index 5bb840c589ac3291ae57e63cd2bd1edb6d14e274..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/jni/ijkmedia +++ /dev/null @@ -1 +0,0 @@ -../../../ijkmedia \ No newline at end of file diff --git a/android/ijkmediaplayer-armv7a/proguard-project.txt b/android/ijkmediaplayer-armv7a/proguard-project.txt deleted file mode 100644 index f2fe1559a217865a5454add526dcc446f892385b..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/android/ijkmediaplayer-armv7a/project.properties b/android/ijkmediaplayer-armv7a/project.properties deleted file mode 100644 index 91d2b024606662ffc769365e22af7ae3f56719de..0000000000000000000000000000000000000000 --- a/android/ijkmediaplayer-armv7a/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 -android.library=true diff --git a/android/ijkmediaplayer/jni/Application.mk b/android/ijkmediaplayer/jni/Application.mk index 44cd1e0e8164300b41b1e4960980ae66ef783099..c7400dc51d70d8019a19c9521bb4bbf1b038e0eb 100644 --- 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