From 3935206f4e6b068bb57d6b2cce6cb4d6f7315d56 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 10 Jul 2018 18:09:51 +0200
Subject: [PATCH] Handle build with sanitizer enabled.

---
 prepare.py               | 12 ++++++++++++
 submodules/cmake-builder |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/prepare.py b/prepare.py
index b4ce81827..f29602f74 100755
--- a/prepare.py
+++ b/prepare.py
@@ -267,6 +267,9 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\
 \t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\
 \tfi
+\tif test -f "liblinphone-sdk/android-arm/lib/wrap.sh"; then \\
+\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh libs/armeabi; \\
+\tfi
 \trm -rf libs-debug/armeabi-v7a
 \trm -rf libs/armeabi-v7a
 \tif test -d "liblinphone-sdk/android-armv7"; then \\
@@ -284,6 +287,9 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\
 \t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
 \tfi
+\tif test -f "liblinphone-sdk/android-armv7/lib/wrap.sh"; then \\
+\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh libs/armeabi-v7a; \\
+\tfi
 \trm -rf libs-debug/arm64-v8a
 \trm -rf libs/arm64-v8a
 \tif test -d "liblinphone-sdk/android-arm64"; then \\
@@ -301,6 +307,9 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs/arm64-v8a && \\
 \t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\
 \tfi
+\tif test -f "liblinphone-sdk/android-arm64/lib/wrap.sh"; then \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh libs/arm64-v8a; \\
+\tfi
 \trm -rf libs-debug/x86
 \trm -rf libs/x86
 \tif test -d "liblinphone-sdk/android-x86"; then \\
@@ -318,6 +327,9 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\
 \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
 \tfi
+\tif test -f "liblinphone-sdk/android-x86/lib/wrap.sh"; then \\
+\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh libs/x86; \\
+\tfi
 
 copy-libs-mediastreamer:
 \trm -rf submodules/mediastreamer2/java/libs/armeabi
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 21ba41720..456993edd 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 21ba41720fbff55d5f33e492022e1b909e3fbadc
+Subproject commit 456993eddd5f4724ff2b59487fb57aa5a85d782a