From 3b2d86e11e06283a1ccf6293e1e038d0850a7964 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 23 May 2018 12:33:50 +0200 Subject: [PATCH] fix vcard grammar loading --- .gitignore | 1 + gradle.properties | 4 ++-- prepare.py | 8 ++++---- res/raw/vcard_grammar | Bin 18454 -> 0 bytes submodules/belcard | 2 +- submodules/linphone | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 res/raw/vcard_grammar diff --git a/.gitignore b/.gitignore index afccd0b7b..7e8c7a41b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ project.properties res/.DS_Store res/raw/lpconfig.xsd res/raw/rootca.pem +res/raw/*_grammar submodules/externals/build/cunit/CUnit/ submodules/externals/build/ffmpeg/arm/ submodules/externals/build/ffmpeg/x86 diff --git a/gradle.properties b/gradle.properties index 4aca4f094..818481447 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ RELEASE_STORE_PASSWORD= RELEASE_KEY_ALIAS= RELEASE_KEY_PASSWORD= -org.gradle.jvmargs=-XX\:MaxHeapSize\=2048M -Xmx2048M -#org.gradle.jvmargs=-Xmx1536M +#org.gradle.jvmargs=-XX\:MaxHeapSize\=2048M -Xmx2048M +org.gradle.jvmargs=-Xmx1536M diff --git a/prepare.py b/prepare.py index ffad5392d..d42cf4b03 100755 --- a/prepare.py +++ b/prepare.py @@ -333,16 +333,16 @@ copy-libs: \t\tcp -R liblinphone-sdk/android-x86/share/linphonej/java/* src/linphone-wrapper; \\ \tfi \tif test -d "liblinphone-sdk/android-arm/share/belr/grammars"; then \\ -\t\tcp liblinphone-sdk/android-arm/share/belr/grammars/cpim_grammar res/raw/; \\ +\t\tcp liblinphone-sdk/android-arm/share/belr/grammars/*_grammar res/raw/; \\ \tfi \tif test -d "liblinphone-sdk/android-armv7/share/belr/grammars"; then \\ -\t\tcp liblinphone-sdk/android-armv7/share/belr/grammars/cpim_grammar res/raw/; \\ +\t\tcp liblinphone-sdk/android-armv7/share/belr/grammars/*_grammar res/raw/; \\ \tfi \tif test -d "liblinphone-sdk/android-arm64/share/belr/grammars"; then \\ -\t\tcp liblinphone-sdk/android-arm64/share/belr/grammars/cpim_grammar res/raw/; \\ +\t\tcp liblinphone-sdk/android-arm64/share/belr/grammars/*_grammar res/raw/; \\ \tfi \tif test -d "liblinphone-sdk/android-x86/share/belr/grammars"; then \\ -\t\tcp liblinphone-sdk/android-x86/share/belr/grammars/cpim_grammar res/raw/; \\ +\t\tcp liblinphone-sdk/android-x86/share/belr/grammars/*_grammar res/raw/; \\ \tfi copy-libs-mediastreamer: diff --git a/res/raw/vcard_grammar b/res/raw/vcard_grammar deleted file mode 100644 index 48ceb8e37075aff072b445bf6973ec1f3eb78fec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18454 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