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

Fix Android build

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2012-04-03 15:02:42 +02:00
parent a41afc0c60
commit 8df7709ac9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
submodules/externals/build/libvpx/Android.mk vendored
View file

@ -7,7 +7,7 @@ LOCAL_MODULE := libvpx
LOCAL_CFLAGS := -O3 -fPIC -D_FORTIFY_SOURCE=0 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement -Wdisabled-optimization -Wpointer-arith -Wtype-limits -Wcast-qual -Wno-unused-function
LOCAL_ARM_MODE := arm
ASM := .s
ASM := .asm.s
### vpx_mem.mk
@ -239,4 +239,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/vp8 \
$(LOCAL_PATH)/vpx_codec
LOCAL_STATIC_LIBRARIES += cpufeatures
include $(BUILD_STATIC_LIBRARY)
$(call import-module,android/cpufeatures)

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6e0a681c9ebabf88ef55c49b3db79cdf68dd7f76
Subproject commit cc40a4f2a7f6fc6eab689208804868d836ddcd8e