From 6836ec4e8161afadc629777acd92e7685fbdb5d6 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 24 Feb 2017 16:55:18 +0100 Subject: [PATCH] Fix liblinphonetester build --- liblinphone_tester/Makefile | 4 +++- liblinphone_tester/build.gradle | 40 ++++++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index 1147836c9..26b8dc004 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -63,4 +63,6 @@ copy-files: ../submodules/linphone/tester/tester_hosts ../submodules/linphone/te cp -rf ../submodules/linphone/tester/rcfiles assets/config_files cp -rf ../submodules/linphone/tester/sounds assets/config_files cp -rf ../submodules/linphone/tester/vcards assets/config_files - cp ../google-services.json . + if [ -a ../google-services.json ] ; \ + then cp ../google-services.json . ; \ + fi; diff --git a/liblinphone_tester/build.gradle b/liblinphone_tester/build.gradle index 94f896041..dbbabd717 100644 --- a/liblinphone_tester/build.gradle +++ b/liblinphone_tester/build.gradle @@ -1,8 +1,17 @@ // Project information buildDir = 'bin' -ext.linphonePackageName = "org.linphone.tester" + +def getPackageName() { + return "org.linphone.tester" +} + +def firebaseEnable() { + File googleFile = new File('google-services.json') + return googleFile.exists() +} buildscript { + File googleFile = new File('google-services.json') repositories { jcenter() mavenCentral() @@ -10,27 +19,46 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.2.0' - classpath 'com.google.gms:google-services:3.0.0' + if (googleFile.exists()) { + classpath 'com.google.gms:google-services:3.0.0' + } } } + apply plugin: 'com.android.application' -apply plugin: 'com.google.gms.google-services' +if (firebaseEnable()) { + apply plugin: 'com.google.gms.google-services' +} + dependencies { compile fileTree(dir: 'libs', include: '*.jar') - compile 'com.google.firebase:firebase-messaging:9.0.0' + if (firebaseEnable()) { + compile 'com.google.firebase:firebase-messaging:9.0.0' + } else { + compile 'com.android.support:support-v4:+' + } } android { defaultConfig { compileSdkVersion 23 buildToolsVersion "25.0.2" - applicationId "org.linphone.tester" + applicationId getPackageName() multiDexEnabled true } sourceSets { main { + String firebase = '' + // Exclude firebase file if not enable + if (!firebaseEnable()) { + firebase = '**/Firebase*' + println '[Push Notification] Firebase disabled' + } else { + println '[Push Notification] Firebase enabled' + } + manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['../submodules/linphone/mediastreamer2/java/src','../submodules/linphone/java/j2se','../submodules/linphone/java/common','../submodules/linphone/java/impl','../submodules/externals/axmlrpc/src/main/java','../submodules/linphone/coreapi/help/java','src'] resources.srcDirs = ['../submodules/linphone/mediastreamer2/java/src','../submodules/linphone/java/j2se','../submodules/linphone/java/common','../submodules/linphone/java/impl','../submodules/externals/axmlrpc/src/main/java','../submodules/linphone/coreapi/help/java','src'] @@ -39,6 +67,8 @@ android { res.srcDirs = ['res'] assets.srcDirs = ['assets'] jniLibs.srcDir 'libs' + + java.exclude firebase } }