From 9c41b637690d6d2039032f023715024d39a03921 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 16 Nov 2018 10:57:01 +0100
Subject: [PATCH] Updated README, gitignore and build.gradle

---
 .gitignore                                    | 40 +------------------
 README.md                                     | 12 ++++--
 app/build.gradle                              |  1 +
 .../linphone-sdk-android-debug.aar            |  1 -
 .../linphone-sdk-android-release.aar          |  1 -
 5 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 120000 linphone-sdk-android/linphone-sdk-android-debug.aar
 delete mode 120000 linphone-sdk-android/linphone-sdk-android-release.aar

diff --git a/.gitignore b/.gitignore
index d4e39e14e..e7267db4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,55 +6,19 @@
 .settings
 adb.pid
 bc-android.keystore
-bin
 build
-certdata.txt
-check_tools.mk
-default.properties
-doc
-gen
-liblinphone-junit-report.xml
-liblinphone-sdk/android-*
-liblinphonetester_*.zip
-libs
-libs-debug
-linphone-android.iml
-linphone-junit-report*.xml
-linphonetester_*.zip
+*.iml
 lint.xml
 local.properties
-Makefile
-obj
-proguard-project.txt
-project.properties
 res/.DS_Store
 res/raw/lpconfig.xsd
-submodules/externals/build/cunit/CUnit/
-submodules/externals/build/ffmpeg/arm/
-submodules/externals/build/ffmpeg/x86
-submodules/externals/build/libvpx/arm
-submodules/externals/build/libvpx/x86
-submodules/externals/build/openh264/arm
-submodules/externals/build/openh264/x86
-submodules/externals/ffmpeg/arm/
-tests/*$py.class
-tests/build.xml
-tests/project.properties
-ant_password.properties
-liblinphone_tester/liblinphonetester_*
-liblinphone_tester/tests.output
-tests/linphonetester_*
-tests/tests.output
-WORK
 .d
 app/google-services.json
 .*clang*
 **/*.iml
-src/linphone-wrapper
-liblinphone_tester/res/raw/
 **/.classpath
 **/.project
 **/*.kdev4
-liblinphone-sdk/res/
 **/.vscode
 res/value-hi_IN
+linphone-sdk-android/*.aar
diff --git a/README.md b/README.md
index 4162e650e..a22aa9b86 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,19 @@ However, if you wish to use a locally compiled SDK here's how to proceed.
 
 ## Building a local SDK
 
-1. Update the submodules of this project (if not done yet) using the following command:
+1. Clone the linphone-sdk repository from out gitlab:
 ```
-git submodule update --recursive --init
+git clone git@gitlab.linphone.org:BC/public/linphone-sdk.git --recursive
 ```
-After that the folder linphone-sdk will now contain all the modules required to build our SDK.
 
 2. Follow the instructions in the linphone-sdk/README file to build the SDK.
 
-3. Rebuild the app in Android Studio.
+3. Edit in the linphone-sdk-android folder of this project the symbolic link (debug or release) to the generated aar:
+```
+ln -s <path to linphone-sdk>/linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-<debug or release>.aar linphone-sdk-android/linphone-sdk-android-<debug or release>.aar
+```
+
+4. Rebuild the app in Android Studio.
 
 ## Create an apk with a different package name
 
diff --git a/app/build.gradle b/app/build.gradle
index 9bcd7e2df..19d824161 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,6 +107,7 @@ dependencies {
     if (isLocalAarAvailable()) {
         implementation project(":linphone-sdk-android")
     } else {
+        // TODO: Use hardcoded correct SDK version number
         releaseImplementation "org.linphone:liblinphone-sdk:${android.defaultConfig.versionName}"
         debugImplementation "org.linphone:liblinphone-sdk:${android.defaultConfig.versionName}-DEBUG"
     }
diff --git a/linphone-sdk-android/linphone-sdk-android-debug.aar b/linphone-sdk-android/linphone-sdk-android-debug.aar
deleted file mode 120000
index 081daac78..000000000
--- a/linphone-sdk-android/linphone-sdk-android-debug.aar
+++ /dev/null
@@ -1 +0,0 @@
-../linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-debug.aar
\ No newline at end of file
diff --git a/linphone-sdk-android/linphone-sdk-android-release.aar b/linphone-sdk-android/linphone-sdk-android-release.aar
deleted file mode 120000
index 5ae44e9e0..000000000
--- a/linphone-sdk-android/linphone-sdk-android-release.aar
+++ /dev/null
@@ -1 +0,0 @@
-../linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
\ No newline at end of file