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

Changes to be able to debug native code.

Browse source
This commit is contained in:
Ghislain MARY 2012-08-14 15:48:15 +02:00
parent 0fc42e16f9
commit e2049ddff8
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AndroidManifest.xml
View file

@ -25,8 +25,7 @@
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/> <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" <activity android:name="org.linphone.LinphoneLauncherActivity"
android:label="@string/app_name" android:label="@string/app_name"

6
jni/Android.mk
View file

@ -74,7 +74,9 @@ include $(linphone-root-dir)/submodules/tunnel/Android.mk
endif endif
ifeq ($(BUILD_SILK), 1) ifeq ($(BUILD_SILK), 1)
ifeq (,$(DUMP_VAR))
$(info Build proprietary SILK plugin for mediastreamer2) $(info Build proprietary SILK plugin for mediastreamer2)
endif
include $(linphone-root-dir)/submodules/mssilk/Android.mk include $(linphone-root-dir)/submodules/mssilk/Android.mk
endif endif
@ -83,7 +85,9 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(linphone-root-dir)/submodules/msilbc/Android.mk include $(linphone-root-dir)/submodules/msilbc/Android.mk
ifeq ($(BUILD_X264), 1) ifeq ($(BUILD_X264), 1)
ifeq (,$(DUMP_VAR))
$(info Build X264 plugin for mediastreamer2) $(info Build X264 plugin for mediastreamer2)
endif
include $(linphone-root-dir)/submodules/msx264/Android.mk include $(linphone-root-dir)/submodules/msx264/Android.mk
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),)
include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
@ -104,7 +108,9 @@ endif #armeabi-v7a
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
ifeq (,$(DUMP_VAR))
$(info Build ZRTP support - makes application GPLv3) $(info Build ZRTP support - makes application GPLv3)
endif
ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),) ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),)
include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
else else