From e2049ddff834cda2446db1cb8636f4191d210d0f Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 14 Aug 2012 15:48:15 +0200
Subject: [PATCH] Changes to be able to debug native code.

---
 AndroidManifest.xml | 3 +--
 jni/Android.mk      | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5bd7366bd..e8db8282e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,8 +25,7 @@
 	
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
     
-    <!-- Don't remove the space after android:debuggable: it prevents ndk-build to try including gdbserver and crash gcc -->
-    <application android:label="@string/app_name" android:debuggable ="true" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true">
+    <application android:label="@string/app_name" android:debuggable="true" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true">
 
 		<activity android:name="org.linphone.LinphoneLauncherActivity"
 		    android:label="@string/app_name"
diff --git a/jni/Android.mk b/jni/Android.mk
index 35e56b068..c311652ba 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -74,7 +74,9 @@ include $(linphone-root-dir)/submodules/tunnel/Android.mk
 endif
 
 ifeq ($(BUILD_SILK), 1)
+ifeq (,$(DUMP_VAR))
 $(info Build proprietary SILK plugin for mediastreamer2)
+endif
 include $(linphone-root-dir)/submodules/mssilk/Android.mk
 endif
 
@@ -83,7 +85,9 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 include $(linphone-root-dir)/submodules/msilbc/Android.mk
 
 ifeq ($(BUILD_X264), 1)
+ifeq (,$(DUMP_VAR))
 $(info Build X264 plugin for mediastreamer2)
+endif
 include $(linphone-root-dir)/submodules/msx264/Android.mk
 ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),)
 include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
@@ -104,7 +108,9 @@ endif #armeabi-v7a
 
 
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
+ifeq (,$(DUMP_VAR))
 $(info Build ZRTP support - makes application GPLv3)
+endif
 ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),)
 include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
 else