From 9dc4f33605c82fd148ff57f27270deab3e68e7fe Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 27 Jul 2018 11:23:12 +0200
Subject: [PATCH] Fixed AAR

---
 aar-tester/app/build.gradle                   |  2 +-
 .../aaar_tester/MainActivity.java             |  5 ++-
 libLinphoneAndroidSdk.gradle                  | 37 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/aar-tester/app/build.gradle b/aar-tester/app/build.gradle
index 2888e3cce..521691459 100644
--- a/aar-tester/app/build.gradle
+++ b/aar-tester/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         applicationId "com.belledonne_communications.aaar_tester"
         minSdkVersion 21
diff --git a/aar-tester/app/src/main/java/com/belledonne_communications/aaar_tester/MainActivity.java b/aar-tester/app/src/main/java/com/belledonne_communications/aaar_tester/MainActivity.java
index 650ad8cf8..2befd03fe 100644
--- a/aar-tester/app/src/main/java/com/belledonne_communications/aaar_tester/MainActivity.java
+++ b/aar-tester/app/src/main/java/com/belledonne_communications/aaar_tester/MainActivity.java
@@ -6,6 +6,7 @@ import android.widget.TextView;
 
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreFactory;
+import org.linphone.core.LinphoneCoreListenerBase;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -19,7 +20,9 @@ public class MainActivity extends AppCompatActivity {
 		LinphoneCoreFactory.instance().setDebugMode(true, getString(R.string.app_name));
 
 		try {
-			LinphoneCore core = LinphoneCoreFactory.instance().createLinphoneCore(null, this);
+			LinphoneCore core = LinphoneCoreFactory.instance().createLinphoneCore(new LinphoneCoreListenerBase() {
+
+			}, this);
 			((TextView)findViewById(R.id.version)).setText(core.getVersion());
 		} catch (Exception e) {
 			((TextView)findViewById(R.id.version)).setText("Error ! " + e);
diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle
index 042ba6bb8..4fe90299f 100644
--- a/libLinphoneAndroidSdk.gradle
+++ b/libLinphoneAndroidSdk.gradle
@@ -68,7 +68,8 @@ android {
             aidl.srcDirs = submoduleDir
             renderscript.srcDirs = submoduleDir
             jniLibs.srcDirs = ['libs']
-
+            assets.srcDirs = ["${buildDir}/sdk-assets/assets/"]
+            
             java.excludes = ['**/mediastream/MediastreamerActivity.java']
 
             // Exclude some useless files
@@ -81,6 +82,21 @@ android {
     }
 }
 
+def rootSdk
+
+if (file('liblinphone-sdk/android-arm64/share/linphone/rootca.pem').exists() )
+    rootSdk = 'liblinphone-sdk/android-arm64'
+else if (file('liblinphone-sdk/android-arm/share/linphone/rootca.pem').exists() )
+    rootSdk = 'liblinphone-sdk/android-arm'
+else if (file('liblinphone-sdk/android-armv7/share/linphone/rootca.pem').exists() )
+    rootSdk = 'liblinphone-sdk/android-armv7'
+else if (file('liblinphone-sdk/android-x86/share/linphone/rootca.pem').exists() )
+    rootSdk = 'liblinphone-sdk/android-x86'
+else {
+	println ("native sdk not ready yet")
+	rootSdk = ""
+}
+
 ///////////// Task /////////////
 
 task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") {
@@ -114,3 +130,22 @@ task sdkZip(type: Zip) {
     include '*'
     archiveName newSdkName
 }
+
+task copyAssets(type: Sync) {
+    from rootSdk
+    into "${buildDir}/sdk-assets/assets/org.linphone.core"
+    include '**/*_grammar'
+
+    //rename '(.*)', '$1'.toLowerCase()
+    eachFile {
+        path = path.toLowerCase() //to workaround case insensitive fs (macosx)
+        println("Syncing sdk asset ${sourcePath} to ${path}")
+    }
+    doFirst {
+        println("Syncing sdk assets into root dir ${destinationDir}")
+     }
+    // do not copy those
+    includeEmptyDirs = false
+
+}
+project.tasks['preBuild'].dependsOn 'copyAssets'