From ae0c9ea8885e062c539366339c919f9cc59c71af Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 11 Jun 2018 15:36:06 +0200 Subject: [PATCH] Update readme, version, config files --- AndroidManifest.xml | 2 +- AndroidManifestSdk.xml | 2 +- README.md | 11 +++-------- build.gradle | 4 ++-- liblinphone-sdk/AndroidManifestLibrary.xml | 6 +++--- liblinphone-sdk/build.gradle | 4 ++-- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3baba3a38..c83fd6e85 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ + android:targetSdkVersion="28"/> diff --git a/AndroidManifestSdk.xml b/AndroidManifestSdk.xml index 6a132d3d1..17de7b7ee 100755 --- a/AndroidManifestSdk.xml +++ b/AndroidManifestSdk.xml @@ -7,5 +7,5 @@ + android:targetSdkVersion="28"/> diff --git a/README.md b/README.md index 113bde647..df4f16c35 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ Linphone is a free VoIP and video softphone based on the SIP protocol. ## To build liblinphone for Android, you must: -1. Download the Android sdk (API 26.0.1 at max) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path and the android-sdk folder to ANDROID_HOME environment variable. +1. Download the Android sdk (API 28.0.0 at max) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path and the android-sdk folder to ANDROID_HOME environment variable. -2. Download the Android ndk (version r11c or 15) from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable. +2. Download the Android ndk (version 16) from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable. -3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.7)_. +3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.10)_. * On 64 bits linux systems you'll need the _ia32-libs_ package. * With the latest Debian (multiarch), you need this: * `dpkg --add-architecture i386` @@ -67,11 +67,6 @@ You can speed up the compilation by using ccache (compiler cache, see [ccache.sa To enable firebase in Linphone, just add your 'google-service.json' in project root, add your key at 'push_sender_id' and add 'firebase' at 'push_type' in 'res/values/non_localizable_custom.xml' Be sure to have all services for Firebase in your 'AndroidManifest.xml' -## Google - -To enable google push in Linphone, remove 'google-service.json' file if it exist, add your key at 'push_sender_id' and add 'google' at 'push_type' in 'res/values/non_localizable_custom.xml' -Be sure to have every permissions and services for GCM in your 'AndroidManifest.xml' - # TROUBLESHOOTING If you encounter the following issue: diff --git a/build.gradle b/build.gradle index 16902bf25..cc77667aa 100644 --- a/build.gradle +++ b/build.gradle @@ -78,8 +78,8 @@ excludePackage.add('**/LICENSE.txt') android { defaultConfig { - compileSdkVersion 26 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.0" applicationId getPackageName() multiDexEnabled true diff --git a/liblinphone-sdk/AndroidManifestLibrary.xml b/liblinphone-sdk/AndroidManifestLibrary.xml index 1d333c9de..650cbb6e1 100755 --- a/liblinphone-sdk/AndroidManifestLibrary.xml +++ b/liblinphone-sdk/AndroidManifestLibrary.xml @@ -2,10 +2,10 @@ + android:versionCode="4001" + android:versionName="4.0.0"> + android:targetSdkVersion="28"/> diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle index fc7b6a88d..e8b6d6fb7 100644 --- a/liblinphone-sdk/build.gradle +++ b/liblinphone-sdk/build.gradle @@ -72,8 +72,8 @@ android { } defaultConfig { - compileSdkVersion 26 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.0" multiDexEnabled true }