From 67ec13c4ec671b706a3694ac40590eed541af6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 19 Nov 2015 11:51:16 -0500
Subject: [PATCH] build: bump dring daemon
* bump daemon to 8c56fd79
* increase minimum NDK to 10 (no time/reasons to test on older versions)
* bump android build tools to version to 23.0.2
* bump support library to version 23.1
* remove commented dependencies
Tuleap: #126
Change-Id: I02ab62e108f28c48c12805d558ffcb84852ab442
---
compile.sh | 14 +++-------
ring-android/app/app.iml | 28 +++++++++++---------
ring-android/app/build.gradle | 9 +++----
ring-android/app/src/main/jni/Application.mk | 7 -----
4 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/compile.sh b/compile.sh
index a93ffdf87..d5c646e52 100755
--- a/compile.sh
+++ b/compile.sh
@@ -126,16 +126,8 @@ case "$REL" in
fi
CXXSTL="/"${GCCVER}
;;
- 9*)
- if [ "${HAVE_64}" = 1 ];then
- echo "You need the NDKv10 or later for 64 bits build"
- exit 1
- fi
- ANDROID_API=android-16
- CXXSTL="/"${GCCVER}
- ;;
- 7|8|*)
- echo "You need the NDKv9 or later"
+ 7|8|9|*)
+ echo "You need the NDKv10 or later"
exit 1
;;
esac
@@ -174,7 +166,7 @@ ANDROID_PATH="`pwd`"
if [ "$FETCH" = 1 ]
then
# 1/ dring
- TESTED_HASH=0b08a64fc8826807d02448941279074da206b8d7
+ TESTED_HASH=8c56fd7952f9b7c8c89a273467227c16691c015f
if [ ! -d "ring-daemon" ]; then
echo "ring daemon source not found, cloning"
git clone https://gerrit-ring.savoirfairelinux.com/ring-daemon.git
diff --git a/ring-android/app/app.iml b/ring-android/app/app.iml
index 279e649c4..6dc7a1f7d 100644
--- a/ring-android/app/app.iml
+++ b/ring-android/app/app.iml
@@ -69,11 +69,12 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.0.1/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.0.1/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.1.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.astuetz/pagerslidingtabstrip/1.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/se.emilsjolander/stickylistheaders/2.7.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -94,16 +95,17 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="libphonenumber-7.0.11" level="project" />
+ <orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
+ <orderEntry type="library" exported="" name="stickylistheaders-2.7.0" level="project" />
+ <orderEntry type="library" exported="" name="robotium-solo-5.4.1" level="project" />
+ <orderEntry type="library" exported="" name="design-23.1.1" level="project" />
<orderEntry type="library" exported="" name="ormlite-android-4.48" level="project" />
<orderEntry type="library" exported="" name="pagerslidingtabstrip-1.0.1" level="project" />
+ <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" />
- <orderEntry type="library" exported="" name="support-v13-23.0.1" level="project" />
- <orderEntry type="library" exported="" name="stickylistheaders-2.7.0" level="project" />
- <orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" />
- <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
- <orderEntry type="library" exported="" name="robotium-solo-5.4.1" level="project" />
- <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
- <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
- <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+ <orderEntry type="library" exported="" name="support-v13-23.1.1" level="project" />
+ <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
+ <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
+ <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index cf33e4ae2..c255c193e 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -4,9 +4,9 @@ dependencies {
compile fileTree(include: '*.jar', dir: 'libs')
compile 'com.j256.ormlite:ormlite-core:4.48'
compile 'com.j256.ormlite:ormlite-android:4.48'
- compile 'com.android.support:support-v13:23.0.+'
- compile 'com.android.support:design:23.0.+'
- compile 'com.android.support:cardview-v7:23.0.+'
+ compile 'com.android.support:support-v13:23.1.+'
+ compile 'com.android.support:design:23.1.+'
+ compile 'com.android.support:cardview-v7:23.1.+'
compile 'com.jayway.android.robotium:robotium-solo:5.4.1'
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
compile 'com.googlecode.libphonenumber:libphonenumber:7.0.11'
@@ -15,8 +15,7 @@ dependencies {
android {
compileSdkVersion 23
- buildToolsVersion "23.0.1"
-
+ buildToolsVersion "23.0.2"
sourceSets {
main {
aidl.srcDirs = ['src/main/java']
diff --git a/ring-android/app/src/main/jni/Application.mk b/ring-android/app/src/main/jni/Application.mk
index fe89ddc37..030c692e0 100644
--- a/ring-android/app/src/main/jni/Application.mk
+++ b/ring-android/app/src/main/jni/Application.mk
@@ -35,11 +35,4 @@ APP_OPTIM := debug
APP_ABI := ${ANDROID_ABI}
NDK_TOOLCHAIN_VERSION := 4.9
-#APP_MODULES += ulaw
-#APP_MODULES += alaw
-#APP_MODULES += g722
-#APP_MODULES += g729
-#APP_MODULES += speex
-#APP_MODULES += gsm
-#APP_MODULES += opus
APP_MODULES += libringjni
--
GitLab