android: bump tools
Refs #74605
Change-Id: I3701b3c55b38050b48df46ee9860d9c94493cab7
diff --git a/ring-android/.idea/misc.xml b/ring-android/.idea/misc.xml
index ce05366..70b496f 100644
--- a/ring-android/.idea/misc.xml
+++ b/ring-android/.idea/misc.xml
@@ -3,8 +3,7 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 22 Platform" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/ring-android/.idea/vcs.xml b/ring-android/.idea/vcs.xml
index def6a6a..6c0b863 100644
--- a/ring-android/.idea/vcs.xml
+++ b/ring-android/.idea/vcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="" vcs="" />
+ <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/ring-android/AndroidManifest.xml b/ring-android/AndroidManifest.xml
index 445efcc..e280033 100644
--- a/ring-android/AndroidManifest.xml
+++ b/ring-android/AndroidManifest.xml
@@ -33,8 +33,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cx.ring"
android:installLocation="auto"
- android:versionCode="13"
- android:versionName="1.4.0" >
+ android:versionCode="14"
+ android:versionName="2.0.0" >
<supports-screens
android:anyDensity="true"
@@ -44,8 +44,8 @@
android:xlargeScreens="true" />
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="21" />
+ android:minSdkVersion="15"
+ android:targetSdkVersion="22" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/ring-android/Tests/AndroidManifest.xml b/ring-android/Tests/AndroidManifest.xml
index 4312c42..2528a9b 100644
--- a/ring-android/Tests/AndroidManifest.xml
+++ b/ring-android/Tests/AndroidManifest.xml
@@ -12,8 +12,8 @@
</application>
<uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="21" />
+ android:minSdkVersion="15"
+ android:targetSdkVersion="22" />
<!--
This declares that this application uses the instrumentation test runner targeting
the package of org.sflphone. To run the tests use the command:
diff --git a/ring-android/Tests/project.properties b/ring-android/Tests/project.properties
index 6e18427..00cf62b 100644
--- a/ring-android/Tests/project.properties
+++ b/ring-android/Tests/project.properties
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-21
+target=android-22
diff --git a/ring-android/build.xml b/ring-android/build.xml
index faae178..da2aecc 100644
--- a/ring-android/build.xml
+++ b/ring-android/build.xml
@@ -88,6 +88,8 @@
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
+ <property name="java.target" value="1.7" />
+ <property name="java.source" value="1.7" />
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
diff --git a/ring-android/jni/Android.mk b/ring-android/jni/Android.mk
index d451a89..e1ffe66 100644
--- a/ring-android/jni/Android.mk
+++ b/ring-android/jni/Android.mk
@@ -43,12 +43,25 @@
ARCH=$(ANDROID_ABI)
CPP_STATIC= $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++$(CXXSTL)/libs/$(ARCH)/libgnustl_static.a \
- $(RING_CONTRIB)/lib/libucommon.a \
- $(RING_CONTRIB)/lib/libccrtp.a \
+ $(RING_CONTRIB)/lib/libexpat.a \
+ $(RING_CONTRIB)/lib/libgnutls.a \
+ $(RING_CONTRIB)/lib/libnettle.a \
+ $(RING_CONTRIB)/lib/libhogweed.a \
$(RING_CONTRIB)/lib/libogg.a \
$(RING_CONTRIB)/lib/libFLAC.a \
- $(RING_CONTRIB)/lib/libgcrypt.a \
- $(RING_CONTRIB)/lib/libgpg-error.a \
+ $(RING_CONTRIB)/lib/libavcodec.a \
+ $(RING_CONTRIB)/lib/libavfilter.a \
+ $(RING_CONTRIB)/lib/libavformat.a \
+ $(RING_CONTRIB)/lib/libavdevice.a \
+ $(RING_CONTRIB)/lib/libavutil.a \
+ $(RING_CONTRIB)/lib/libswscale.a \
+ $(RING_CONTRIB)/lib/libz.a \
+ $(RING_CONTRIB)/lib/libupnp.a \
+ $(RING_CONTRIB)/lib/libthreadutil.a \
+ $(RING_CONTRIB)/lib/libiconv.a \
+ $(RING_CONTRIB)/lib/libixml.a \
+ $(RING_CONTRIB)/lib/libgmp.a \
+ $(RING_CONTRIB)/lib/libopendht.a
ifeq ($(ARCH),$(filter $(ARCH),x86))
CPP_STATIC += $(RING_CONTRIB)/lib/libpjlib-util-i686-pc-linux-android.a \
@@ -86,7 +99,7 @@
LOCAL_LDLIBS += -lz \
-llog \
-lOpenSLES \
- $(RING_BUILD_DIR)/src/.libs/libdring.a \
+ $(RING_BUILD_DIR)/src/.libs/libring.a \
ifeq ($(ARCH),$(filter $(ARCH),x86))
@@ -116,12 +129,13 @@
LOCAL_LDLIBS += -lexpat -lhogweed \
-lspeexdsp -lvorbisfile -lyaml-cpp \
- -lFLAC -liax -lgcrypt -lnettle \
- -logg -lucommon \
- -lpcre -lsamplerate -luuid -lccrtp -lgpg-error -lpcrecpp \
+ -lFLAC -liax -lnettle \
+ -logg \
+ -lpcre -lsamplerate -luuid \
-lsndfile -lvorbis \
- -lcommoncpp -lspeex -lvorbisenc \
+ -lspeex -lvorbisenc \
-lgmp -lgnutls -lopendht \
+ -lavformat -lavcodec -lavutil \
$(CPP_STATIC)
diff --git a/ring-android/libs/android-support-v13.jar b/ring-android/libs/android-support-v13.jar
index eb5eca3..68da3a8 100644
--- a/ring-android/libs/android-support-v13.jar
+++ b/ring-android/libs/android-support-v13.jar
Binary files differ
diff --git a/ring-android/project.properties b/ring-android/project.properties
index 4ab1256..00cf62b 100644
--- a/ring-android/project.properties
+++ b/ring-android/project.properties
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-19
+target=android-22