From 7187c810f5b4227e60a3bb20749a89456df69afc Mon Sep 17 00:00:00 2001 From: tom Date: Mon, 15 Feb 2016 16:41:55 +0800 Subject: [PATCH] fix crash on arm64 devices --- .gitignore | 1 + GiraffePlayer.iml | 19 ------ app/app.iml | 98 ------------------------------- app/build.gradle | 4 ++ giraffeplayer/giraffeplayer.iml | 97 ------------------------------ gradle.properties | 3 +- ijkplayer-java/ijkplayer-java.iml | 93 ----------------------------- 7 files changed, 7 insertions(+), 308 deletions(-) delete mode 100644 GiraffePlayer.iml delete mode 100644 app/app.iml delete mode 100644 giraffeplayer/giraffeplayer.iml delete mode 100644 ijkplayer-java/ijkplayer-java.iml diff --git a/.gitignore b/.gitignore index 059cdeb..f68d2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .DS_Store /build /captures +**/*.iml diff --git a/GiraffePlayer.iml b/GiraffePlayer.iml deleted file mode 100644 index d7eb6f3..0000000 --- a/GiraffePlayer.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index a7f6914..0000000 --- a/app/app.iml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 81c92c5..8642c6e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,10 @@ android { targetSdkVersion 23 versionCode 1 versionName "1.0" + + ndk { + abiFilters "armeabi-v7a" + } } buildTypes { release { diff --git a/giraffeplayer/giraffeplayer.iml b/giraffeplayer/giraffeplayer.iml deleted file mode 100644 index 79b5869..0000000 --- a/giraffeplayer/giraffeplayer.iml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1d3591c..db0d38a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,5 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.useDeprecatedNdk=true diff --git a/ijkplayer-java/ijkplayer-java.iml b/ijkplayer-java/ijkplayer-java.iml deleted file mode 100644 index afc3457..0000000 --- a/ijkplayer-java/ijkplayer-java.iml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file