From d8a5a439dfde8b1050aaf385b2d3fc96846a6a9f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 26 Oct 2017 10:41:54 +0200 Subject: [PATCH] Added soci submodule --- .gitmodules | 3 +++ prepare.py | 2 ++ submodules/externals/soci | 1 + submodules/linphone | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 submodules/externals/soci diff --git a/.gitmodules b/.gitmodules index 6a06d889f..22b010a01 100644 --- a/.gitmodules +++ b/.gitmodules @@ -118,3 +118,6 @@ [submodule "submodules/externals/libxsd"] path = submodules/externals/libxsd url = git://git.linphone.org/libxsd +[submodule "submodules/externals/soci"] + path = submodules/externals/soci + url = git://git.linphone.org/soci diff --git a/prepare.py b/prepare.py index 2105492c6..388a4f5b0 100755 --- a/prepare.py +++ b/prepare.py @@ -269,9 +269,11 @@ copy-libs: \t\tcp -R liblinphone-sdk/android-arm64/share/linphonej/java/* src/linphone-wrapper && \\ \t\tmkdir -p libs-debug/arm64-v8a && \\ \t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs-debug/arm64-v8a && \\ +\t\tcp -f liblinphone-sdk/android-arm64/lib64/lib*.so libs-debug/arm64-v8a && \\ \t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs-debug/arm64-v8a && \\ \t\tmkdir -p libs/arm64-v8a && \\ \t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs/arm64-v8a && \\ +\t\tcp -f liblinphone-sdk/android-arm64/lib64/lib*.so libs/arm64-v8a && \\ \t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs/arm64-v8a && \\ \t\tsh WORK/android-arm64/strip.sh libs/arm64-v8a/*.so; \\ \tfi diff --git a/submodules/externals/soci b/submodules/externals/soci new file mode 160000 index 000000000..ef73c7b2a --- /dev/null +++ b/submodules/externals/soci @@ -0,0 +1 @@ +Subproject commit ef73c7b2a63b3959a2631cc0a73706b0ffbe93df diff --git a/submodules/linphone b/submodules/linphone index 639792b0e..c5ad52bd4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 639792b0e760e23bb59feaf86db64d4430dce8a2 +Subproject commit c5ad52bd4218835126f8ea984dd4413bdaf3c598