Update org.linphone to 4.0.1

Fixes #1179
This commit is contained in:
Jan-Philipp Litza 2018-10-21 16:39:00 +00:00 committed by relan
parent 8117376981
commit d1088c5930
2 changed files with 117 additions and 0 deletions

View file

@ -318,6 +318,26 @@ Build:3.3.2,3320
make `pwd`/res/raw/rootca.pem make `pwd`/res/raw/rootca.pem
ndk=r15c ndk=r15c
Build:4.0.1,4002
commit=4.0.1
submodules=yes
sudo=apt-get update && \
apt-get install -y cmake -t testing && \
apt-get install -y python-pystache doxygen
patch=4.0-gradle.patch
gradle=yes
output=bin/outputs/apk/release/org.linphone-release-unsigned.apk
rm=liblinphone_tester,submodules/belle-sip/src/antlr3c/antlr-3.4-complete.jar,src/android/org/linphone/firebase/Firebase*.java,submodules/externals/xerces-c/tools/jars
prebuild=sed -i -e 's|"kill_service_with_task_manager">true<|"kill_service_with_task_manager">false<|' res/values/non_localizable_custom.xml
scanignore=submodules/belcard/src/vcard_grammar,submodules/linphone/share/cpim_grammar
scandelete=submodules
build=echo 'gradle "$@"' > gradlew && \
chmod a+x gradlew && \
./prepare.py && \
make -j`nproc` build && \
make copy-libs
ndk=r16b
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:4.0.1 Current Version:4.0.1

View file

@ -0,0 +1,97 @@
diff --git a/build.gradle b/build.gradle
index cc77667a..48dc31ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,33 +5,24 @@ def getPackageName() {
return "org.linphone"
}
-def firebaseEnable() {
- File googleFile = new File('google-services.json')
- return googleFile.exists()
-}
-
buildscript {
- File googleFile = new File('google-services.json')
repositories {
+ google()
jcenter()
mavenCentral()
mavenLocal()
- google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
- if (googleFile.exists()) {
- classpath 'com.google.gms:google-services:3.1.0'
- }
}
}
allprojects {
repositories {
+ google()
jcenter()
mavenCentral()
mavenLocal()
- google()
}
}
@@ -44,28 +35,12 @@ dependencies {
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
androidTestImplementation 'junit:junit:4.12'
implementation 'org.apache.commons:commons-compress:1.16.1'
- if (firebaseEnable()) {
- implementation 'com.google.firebase:firebase-messaging:15.0.2'
- }
implementation 'com.android.support:support-v4:27.0.1'
implementation project(':liblinphone-sdk')
}
-if (firebaseEnable()) {
- apply plugin: 'com.google.gms.google-services'
-}
-
///// Exclude Files /////
def excludeFiles = []
-// Exclude firebase file if not enable
-if (!firebaseEnable()) {
- excludeFiles.add('**/Firebase*')
- println '[Push Notification] Firebase disabled'
-} else {
- excludeFiles.add('**/gcm*')
- println '[Push Notification] Firebase enabled'
-}
-
excludeFiles.add('src/android/org/linphone/tutorials/*.java')
def excludePackage = []
diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle
index 9889fe32..628c5f06 100644
--- a/liblinphone-sdk/build.gradle
+++ b/liblinphone-sdk/build.gradle
@@ -2,10 +2,10 @@
buildDir = 'bin'
buildscript {
repositories {
+ google()
jcenter()
mavenCentral()
mavenLocal()
- google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0'
@@ -14,10 +14,10 @@ buildscript {
allprojects {
repositories {
+ google()
jcenter()
mavenCentral()
mavenLocal()
- google()
}
}