From 18cb246468dafb932164154be1bbe134f908345c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 25 Jan 2019 16:40:18 +0100 Subject: [PATCH] Add AndroidPlatformHelper.java to gradle builds. --- libLinphoneAndroidSdk.gradle | 12 ++++++++++-- linphoneAndroidSdk.gradle | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle index 50452ae8b..c133c34a4 100644 --- a/libLinphoneAndroidSdk.gradle +++ b/libLinphoneAndroidSdk.gradle @@ -40,7 +40,8 @@ def submoduleDir = ['submodules/mediastreamer2/java/src', 'submodules/linphone/java/j2se', 'submodules/linphone/java/common', 'submodules/linphone/java/impl', - 'submodules/linphone/coreapi/help/examples/java'] + 'submodules/linphone/coreapi/help/examples/java' + 'submodules/linphone/wrappers/java/classes/tools'] def excludePackage = [] @@ -50,6 +51,13 @@ excludePackage.add('**/libopenh264**') excludePackage.add('**/**tester**') excludePackage.add('**/LICENSE.txt') + +def excludeFiles = [] +excludeFiles.add(''**/mediastream/MediastreamerActivity.java') +excludeFiles.add('H264Helper.java') +excludeFiles.add('OpenH264DownloadHelper.java') +excludeFiles.add('OpenH264DownloadHelperListener.java') + android { defaultConfig { compileSdkVersion 26 @@ -74,7 +82,7 @@ android { jniLibs.srcDirs = ['libs'] assets.srcDirs = ["${buildDir}/sdk-assets/assets/"] - java.excludes = ['**/mediastream/MediastreamerActivity.java'] + java.excludes = excludeFiles // Exclude some useless files packagingOptions { diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle index 648645072..79f1761d1 100644 --- a/linphoneAndroidSdk.gradle +++ b/linphoneAndroidSdk.gradle @@ -36,6 +36,7 @@ def srcDirs = ['submodules/mediastreamer2/java/src', 'submodules/linphone/java/common', 'submodules/linphone/java/impl', 'submodules/linphone/coreapi/help/examples/java', + 'submodules/linphone/wrappers/java/classes/tools/', 'src/android'] def excludeFiles = [] @@ -44,6 +45,9 @@ def excludeFiles = [] excludeFiles.add('**/Firebase*') excludeFiles.add('**/gcm*') excludeFiles.add('**/mediastream/MediastreamerActivity.java') +excludeFiles.add('H264Helper.java') +excludeFiles.add('OpenH264DownloadHelper.java') +excludeFiles.add('OpenH264DownloadHelperListener.java') def excludePackage = []