Skip to content
Snippets Groups Projects
Commit 67ec13c4 authored by Adrien Béraud's avatar Adrien Béraud Committed by Guillaume Roguez
Browse files

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
parent f11e3dff
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
compile.sh
+ 3
− 11
View file @ 67ec13c4
...@@ -126,16 +126,8 @@ case "$REL" in ...@@ -126,16 +126,8 @@ case "$REL" in
fi fi
CXXSTL="/"${GCCVER} CXXSTL="/"${GCCVER}
;; ;;
9*) 7|8|9|*)
if [ "${HAVE_64}" = 1 ];then echo "You need the NDKv10 or later"
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"
exit 1 exit 1
;; ;;
esac esac
...@@ -174,7 +166,7 @@ ANDROID_PATH="`pwd`" ...@@ -174,7 +166,7 @@ ANDROID_PATH="`pwd`"
if [ "$FETCH" = 1 ] if [ "$FETCH" = 1 ]
then then
# 1/ dring # 1/ dring
TESTED_HASH=0b08a64fc8826807d02448941279074da206b8d7 TESTED_HASH=8c56fd7952f9b7c8c89a273467227c16691c015f
if [ ! -d "ring-daemon" ]; then if [ ! -d "ring-daemon" ]; then
echo "ring daemon source not found, cloning" echo "ring daemon source not found, cloning"
git clone https://gerrit-ring.savoirfairelinux.com/ring-daemon.git git clone https://gerrit-ring.savoirfairelinux.com/ring-daemon.git
......
ring-android/app/app.iml
+ 15
− 13
View file @ 67ec13c4
...@@ -69,11 +69,12 @@ ...@@ -69,11 +69,12 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> <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" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> <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/appcompat-v7/23.1.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/cardview-v7/23.1.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/design/23.1.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/recyclerview-v7/23.1.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/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/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/exploded-aar/se.emilsjolander/stickylistheaders/2.7.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
...@@ -94,16 +95,17 @@ ...@@ -94,16 +95,17 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="libphonenumber-7.0.11" level="project" /> <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="ormlite-android-4.48" level="project" />
<orderEntry type="library" exported="" name="pagerslidingtabstrip-1.0.1" 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="ormlite-core-4.48" level="project" />
<orderEntry type="library" exported="" name="support-v13-23.0.1" level="project" /> <orderEntry type="library" exported="" name="support-v13-23.1.1" level="project" />
<orderEntry type="library" exported="" name="stickylistheaders-2.7.0" level="project" /> <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" /> <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-23.1.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" />
</component> </component>
</module> </module>
\ No newline at end of file
ring-android/app/build.gradle
+ 4
− 5
View file @ 67ec13c4
...@@ -4,9 +4,9 @@ dependencies { ...@@ -4,9 +4,9 @@ dependencies {
compile fileTree(include: '*.jar', dir: 'libs') compile fileTree(include: '*.jar', dir: 'libs')
compile 'com.j256.ormlite:ormlite-core:4.48' compile 'com.j256.ormlite:ormlite-core:4.48'
compile 'com.j256.ormlite:ormlite-android:4.48' compile 'com.j256.ormlite:ormlite-android:4.48'
compile 'com.android.support:support-v13:23.0.+' compile 'com.android.support:support-v13:23.1.+'
compile 'com.android.support:design:23.0.+' compile 'com.android.support:design:23.1.+'
compile 'com.android.support:cardview-v7:23.0.+' compile 'com.android.support:cardview-v7:23.1.+'
compile 'com.jayway.android.robotium:robotium-solo:5.4.1' compile 'com.jayway.android.robotium:robotium-solo:5.4.1'
compile 'com.astuetz:pagerslidingtabstrip:1.0.1' compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
compile 'com.googlecode.libphonenumber:libphonenumber:7.0.11' compile 'com.googlecode.libphonenumber:libphonenumber:7.0.11'
...@@ -15,8 +15,7 @@ dependencies { ...@@ -15,8 +15,7 @@ dependencies {
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.1" buildToolsVersion "23.0.2"
sourceSets { sourceSets {
main { main {
aidl.srcDirs = ['src/main/java'] aidl.srcDirs = ['src/main/java']
......
ring-android/app/src/main/jni/Application.mk
+ 0
− 7
View file @ 67ec13c4
...@@ -35,11 +35,4 @@ APP_OPTIM := debug ...@@ -35,11 +35,4 @@ APP_OPTIM := debug
APP_ABI := ${ANDROID_ABI} APP_ABI := ${ANDROID_ABI}
NDK_TOOLCHAIN_VERSION := 4.9 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 APP_MODULES += libringjni
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment