android: migrate to Android Studio build system

.gitignore

@@ -7,14 +7,6 @@ ios/ffmpeg-*
 ios/openssl-*
 extra
 .DS_Store
-android/ijkmediaplayer/.settings/*
-android/ijkmediaplayer-x86/.settings/*
-android/ijkmediaplayer-armv5/.settings/*
-android/ijkmediaplayer-arm64-v8a/.settings/*
-android/ijkmediawidget/.settings/*
-android/ijkmediademo/.settings/*
-android/contrib/appcompat/.settings/
-android/ijkmediademo/lint.xml
 ijkmedia/ijkyuv/
 
 # built application files

NEWS.md

@@ -1,5 +1,8 @@
 tag next
 --------------------------------
+android: support build with Android Studio / Gradle
+build: improve library fetch
+openssl: switch to openssl 1.0.1o
 
 tag k0.2.4
 --------------------------------

android/.gitignore

@@ -1 +1,86 @@
-build
+#--------------------
+# Android.gitignore
+# https://github.com/github/gitignore/blob/master/Android.gitignore
+#--------------------
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+#--------------------
+# Gradle.gitignore
+# https://github.com/github/gitignore/blob/master/Gradle.gitignore
+#--------------------
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+
+#--------------------
+# Android Studio .gitignore
+# https://gist.github.com/iainconnor/8605514
+#--------------------
+# Built application files
+/*/build/
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# User-specific configurations
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+*.iml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

android/compile-ijk.sh

@@ -28,22 +28,22 @@ do_ndk_build () {
     PARAM_TARGET=$1
     case "$PARAM_TARGET" in
         armv7a)
-            cd ijkmediaplayer/jni
+            cd ijkplayer/player-armv7a/src/main/jni
             $ANDROID_NDK/ndk-build
             cd -
         ;;
         armv5)
-            cd ijkmediaplayer-armv5/jni
+            cd ijkplayer/player-armv5/src/main/jni
             $ANDROID_NDK/ndk-build
             cd -
         ;;
         x86)
-            cd ijkmediaplayer-x86/jni
+            cd ijkplayer/player-x86/src/main/jni
             $ANDROID_NDK/ndk-build
             cd -
         ;;
-        arm64-v8a)
-            cd ijkmediaplayer-arm64-v8a/jni
+        arm64)
+            cd ijkplayer/player-arm64/src/main/jni
             $ANDROID_NDK/ndk-build
             cd -
         ;;
@@ -55,7 +55,7 @@ case "$REQUEST_TARGET" in
     "")
         do_ndk_build armv7a;
     ;;
-    armv5|armv7a|x86|arm64-v8a)
+    armv5|armv7a|x86|arm64)
         do_ndk_build $REQUEST_TARGET;
     ;;
     all)
@@ -66,7 +66,7 @@ case "$REQUEST_TARGET" in
     ;;
     *)
         echo "Usage:"
-        echo "  compile-ijk.sh armv5|armv7a|x86|arm64-v8a"
+        echo "  compile-ijk.sh armv5|armv7a|x86|arm64"
         echo "  compile-ijk.sh all"
     ;;
 esac

android/contrib/.gitignore

@@ -0,0 +1,3 @@
+build
+ffmpeg-*
+openssl-*

android/contrib/appcompat/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

android/contrib/appcompat/AndroidManifest.xml

@@ -15,6 +15,6 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.support.v7.appcompat">
-    <uses-sdk android:minSdkVersion="7"/>
+    <uses-sdk android:minSdkVersion="9"/>
     <application />
 </manifest>

android/contrib/appcompat/res/anim/abc_popup_enter.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:shareInterpolator="false" >
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:duration="@integer/abc_config_activityShortDur" />
+</set>

android/contrib/appcompat/res/anim/abc_popup_exit.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:shareInterpolator="false" >
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:duration="@integer/abc_config_activityShortDur" />
+</set>

android/contrib/appcompat/res/color-v11/abc_background_cache_hint_selector_material_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_accelerated="false" android:color="@color/background_material_dark" />
+    <item android:color="@android:color/transparent" />
+</selector>

android/contrib/appcompat/res/color-v11/abc_background_cache_hint_selector_material_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_accelerated="false" android:color="@color/background_material_light" />
+    <item android:color="@android:color/transparent" />
+</selector>

android/contrib/appcompat/res/color/abc_background_cache_hint_selector_material_dark.xml

@@ -15,6 +15,5 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_accelerated="false" android:color="@color/background_material_dark" />
-    <item android:color="@android:color/transparent" />
+    <item android:color="@color/background_material_dark" />
 </selector>

android/contrib/appcompat/res/color/abc_background_cache_hint_selector_material_light.xml

@@ -15,6 +15,5 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_accelerated="false" android:color="@color/background_material_light" />
-    <item android:color="@android:color/transparent" />
+    <item android:color="@color/background_material_light" />
 </selector>

android/contrib/appcompat/res/color/switch_thumb_material_dark.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_dark"/>
+    <item android:color="@color/switch_thumb_normal_material_dark"/>
+</selector>

android/contrib/appcompat/res/color/switch_thumb_material_light.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_light"/>
+    <item android:color="@color/switch_thumb_normal_material_light"/>
+</selector>

android/contrib/appcompat/res/drawable/abc_btn_borderless_material.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:drawable="@drawable/abc_btn_default_mtrl_shape"/>
+    <item android:state_pressed="true" android:drawable="@drawable/abc_btn_default_mtrl_shape"/>
+    <item android:drawable="@android:color/transparent"/>
+</selector>
+

android/contrib/appcompat/res/drawable/abc_cab_background_top_material.xml

@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            android:paddingMode="stack">
-    <item android:drawable="@drawable/abc_cab_background_internal_bg" />
-    <item android:drawable="@drawable/abc_cab_background_top_mtrl_alpha" />
-</layer-list>
+<!-- This is a dummy drawable so that we can refer to the drawable ID -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/white"/>
+</shape>