.gitlab-ci-files/job-android.yml

@@ -37,6 +37,10 @@
 job-android-makefile-r16b:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r16b
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
@@ -46,6 +50,10 @@ job-android-makefile-r16b:
 job-android-makefile-r17c:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
@@ -56,6 +64,10 @@ job-android-makefile-r17c:
 job-android-makefile-r18b:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r18b
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
@@ -65,6 +77,10 @@ job-android-makefile-r18b:
 job-android-makefile-r19:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r19
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
@@ -79,6 +95,10 @@ job-android-makefile-r19:
 job-android-ninja-r16b:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r16b
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Ninja
   extends: .scheduled-job-android
@@ -96,6 +116,9 @@ job-android-ninja-r16b-novideo:
 job-android-ninja-r17c:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c
+  except:
+    variables:
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Ninja
     CMAKE_OPTIONS: -DENABLE_AAUDIO=ON
@@ -106,6 +129,10 @@ job-android-ninja-r17c-novideo:
 
   only:
     - schedules
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_AAUDIO=ON
   extends: job-android-ninja-r17c
@@ -114,6 +141,10 @@ job-android-ninja-r17c-novideo:
 job-android-ninja-r18b:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r18b
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Ninja
     CMAKE_OPTIONS: -DENABLE_AAUDIO=ON
@@ -123,6 +154,10 @@ job-android-ninja-r18b:
 job-android-ninja-r19:
 
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r19
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
   variables:
     CMAKE_GENERATOR: Ninja
     CMAKE_OPTIONS: -DENABLE_AAUDIO=ON

.gitlab-ci-files/job-ios.yml

@@ -33,6 +33,11 @@
 
 job-ios-makefile:
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
@@ -46,6 +51,11 @@ job-ios-makefile:
 
 job-ios-ninja:
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   variables:
     CMAKE_GENERATOR: Ninja
   extends: .job-ios
@@ -53,6 +63,11 @@ job-ios-ninja:
 
 job-ios-ninja-novideo:
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   only:
     - schedules
   variables:
@@ -70,6 +85,10 @@ job-ios-xcode:
   stage: build
   tags: [ "macosx" ]
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+
   only:
     - schedules
   script:

.gitlab-ci-files/job-linux-desktop.yml

@@ -3,6 +3,11 @@
   stage: build
   extends: .linux-prepare
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   script:
     - export CC=$CC
     - export CXX=$CXX

.gitlab-ci-files/job-macosx.yml

@@ -4,6 +4,11 @@
   stage: build
   tags: [ "macosx" ]
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   script:
     - ccache -s
     - mkdir -p build-desktop
@@ -59,6 +64,11 @@ job-macosx-xcode:
   stage: build
   tags: [ "macosx" ]
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   only:
     - schedules
   script:

.gitlab-ci-files/job-uploads.yml

@@ -8,6 +8,10 @@ job-ios-upload:
   stage: deploy
   tags: [ "deploy" ]
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+
   only:
     - schedules
   dependencies:
@@ -33,6 +37,10 @@ job-android-upload:
   tags: [ "docker-android" ]
   image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-android:r17c
 
+  except:
+    variables:
+      - $DEPLOY_RUN_IOS
+
   variables:
     CCACHE_SIZE: 4G
     CMAKE_GENERATOR: Ninja

.gitlab-ci-files/job-windows.yml

@@ -8,6 +8,11 @@ job-windows-vs2015:
   stage: build
   tags: [ "windows" ]
 
+  except:
+    variables:
+      - $DEPLOY_RUN_ANDROID
+      - $DEPLOY_RUN_IOS
+
   script:
     - mkdir build-desktop
     - cd build-desktop

linphone @ b1e218ba

-Subproject commit c1d4e3870dce2de8e9c64fdd0bb5f9d26efb145a
+Subproject commit b1e218bad5a2b701cb62e864d22d1794fafd7e67

mediastreamer2 @ 2ee3f8b4

-Subproject commit 9eaed75d6d9772ea4081308cbfb0978e886a356f
+Subproject commit 2ee3f8b44ba2df6217033c7a3afea5bec22f8220

tester/Android/app/build.gradle

@@ -5,6 +5,19 @@ excludePackage.add('**/gdb.*')
 excludePackage.add('**/libopenh264**')
 excludePackage.add('**/LICENSE.txt')
 
+static def isLocalAarAvailable() {
+    File debugAar = new File('linphone-sdk-android/linphone-sdk-android-debug.aar')
+    File releaseAar = new File('linphone-sdk-android/linphone-sdk-android-release.aar')
+    return debugAar.exists() || releaseAar.exists()
+}
+
+repositories {
+    maven {
+        // Switch to release for releases !
+        url "https://gitlab.linphone.org/BC/public/maven_repository/raw/master"
+    }
+}
+
 android {
     compileSdkVersion 28
     defaultConfig {
@@ -45,7 +58,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
-    implementation project(":linphone-sdk-android")
+
+    if (isLocalAarAvailable()) {
+        implementation project(":linphone-sdk-android")
+    } else {
+        implementation "org.linphone:linphone-sdk-android:4.1+"
+    }
 
     // Required for instrumented tests
     implementation 'androidx.test:runner:1.1.0'

tester/Android/app/src/main/java/org/linphone/tester/Tester.java

@@ -20,7 +20,6 @@ package org.linphone.tester;
  */
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
 
 import org.junit.After;
 import org.junit.Before;
@@ -31,6 +30,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+
 public class Tester {
     public native void setApplicationContext(Context ct);
     public native void removeApplicationContext();
@@ -110,11 +111,11 @@ public class Tester {
         System.loadLibrary("bctoolbox-tester");
         System.loadLibrary("linphonetester");
 
-        keepAccounts(false);
-        //keepAccounts(true);
+        //keepAccounts(false);
+        keepAccounts(true);
 
         if (mContext == null) {
-            mContext = InstrumentationRegistry.getTargetContext();
+            mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
         }
         setApplicationContext(mContext);
 
@@ -124,14 +125,14 @@ public class Tester {
     @Before
     public void initTest() {
         if (mContext == null) {
-            mContext = InstrumentationRegistry.getTargetContext();
+            mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
         }
         setApplicationContext(mContext);
     }
 
     @After
     public void tearDown() {
-        //clearAccounts();
+        clearAccounts();
         removeApplicationContext();
     }
 

tester/Android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong