diff --git a/.gitignore b/.gitignore index 7e8c7a41b..13a14ee3e 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ gradle.properties .*clang* linphone.iml src/linphone-wrapper +liblinphone_tester/res/raw/ diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index 7f7ce7d6a..673f7afe0 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -57,3 +57,15 @@ copy-files: ../submodules/linphone/tester/tester_hosts cp -rf ../submodules/linphone/tester/rcfiles assets/config_files cp -rf ../submodules/linphone/tester/sounds assets/config_files cp -rf ../submodules/linphone/tester/vcards assets/config_files + if test -d "../liblinphone-sdk/android-arm/share/belr/grammars"; then \ + cp ../liblinphone-sdk/android-arm/share/belr/grammars/*_grammar res/raw/; \ + fi + if test -d "../liblinphone-sdk/android-armv7/share/belr/grammars"; then \ + cp ../liblinphone-sdk/android-armv7/share/belr/grammars/*_grammar res/raw/; \ + fi + if test -d "../liblinphone-sdk/android-arm64/share/belr/grammars"; then \ + cp ../liblinphone-sdk/android-arm64/share/belr/grammars/*_grammar res/raw/; \ + fi + if test -d "../liblinphone-sdk/android-x86/share/belr/grammars"; then \ + cp ../liblinphone-sdk/android-x86/share/belr/grammars/*_grammar res/raw/; \ + fi diff --git a/liblinphone_tester/res/raw/cpim_grammar b/liblinphone_tester/res/raw/cpim_grammar deleted file mode 100644 index 6f8b36d95..000000000 Binary files a/liblinphone_tester/res/raw/cpim_grammar and /dev/null differ diff --git a/liblinphone_tester/res/raw/vcard_grammar b/liblinphone_tester/res/raw/vcard_grammar deleted file mode 100644 index 48ceb8e37..000000000 Binary files a/liblinphone_tester/res/raw/vcard_grammar and /dev/null differ diff --git a/submodules/linphone b/submodules/linphone index cede35839..9986a5e9d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit cede358396b9a21267a17e1ed83f20a481832615 +Subproject commit 9986a5e9d5a6b63510128c6704a9a0f803d917ee