From 655fdb48aecc4a1540ada2e02451566c9b750b87 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 4 Apr 2017 15:17:19 +0200 Subject: [PATCH] Fix mediastreamer2 path in build --- build.gradle | 2 +- libLinphoneAndroidSdk.gradle | 2 +- linphoneAndroidSdk.gradle | 4 ++-- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index b4f723654..9179e71c6 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ if (firebaseEnable()) { } //// Submodule Dir ///// -def submoduleDir = ['submodules/linphone/mediastreamer2/java/src', +def submoduleDir = ['submodules/mediastreamer2/java/src', 'submodules/linphone/java/j2se', 'submodules/linphone/java/common', 'submodules/linphone/java/impl', diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle index 3b039a3c2..e6bfefca7 100644 --- a/libLinphoneAndroidSdk.gradle +++ b/libLinphoneAndroidSdk.gradle @@ -18,7 +18,7 @@ dependencies { compile fileTree(dir: 'libs', include: 'commons-compress-1.11.jar') } -def submoduleDir = ['submodules/linphone/mediastreamer2/java/src', +def submoduleDir = ['submodules/mediastreamer2/java/src', 'submodules/linphone/java/j2se', 'submodules/linphone/java/common', 'submodules/linphone/java/impl', diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle index 218e92829..ac3977bd4 100644 --- a/linphoneAndroidSdk.gradle +++ b/linphoneAndroidSdk.gradle @@ -28,7 +28,7 @@ dependencies { apply plugin: 'com.google.gms.google-services' -def srcDirs = ['submodules/linphone/mediastreamer2/java/src', +def srcDirs = ['submodules/mediastreamer2/java/src', 'submodules/linphone/java/j2se', 'submodules/linphone/java/common', 'submodules/linphone/java/impl', @@ -92,7 +92,7 @@ android { ///////////// Task ///////////// task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") { - source = ['submodules/linphone/mediastreamer2/java/src', + source = ['submodules/mediastreamer2/java/src', 'submodules/linphone/java/j2se', 'submodules/linphone/java/common', 'submodules/linphone/java/impl', diff --git a/submodules/cmake-builder b/submodules/cmake-builder index faf200fea..bc6df3cfa 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit faf200fea74e8be860d3d980686a86411bb29b9f +Subproject commit bc6df3cfa2c2f8cc54fb225735374c246b68721b diff --git a/submodules/linphone b/submodules/linphone index 5e02b53ee..3773668d8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5e02b53ee66b73e64bfc41e6ac2ed74296f42f60 +Subproject commit 3773668d8a6c40f64ba9b5330bf48caf5258ac87