Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix vcard grammar loading

Browse source
This commit is contained in:
Jehan Monnier 2018-05-23 12:33:50 +02:00
parent aa0169d2dd
commit 3b2d86e11e
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -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

4
gradle.properties
View file

@ -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

8
prepare.py
View file

@ -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:

BIN
res/raw/vcard_grammar
View file

Binary file not shown.

2
submodules/belcard

@ -1 +1 @@
Subproject commit 7376c8ba975617c8b2a7232c3acc428513a4ae8f
Subproject commit b1622d7ddf1cbe6a0f929537861dfa8b45b293c4

2
submodules/linphone

@ -1 +1 @@
Subproject commit 836cbdf97f28539b80200ac62d9faeb01d4387e9
Subproject commit cede358396b9a21267a17e1ed83f20a481832615