Fix for ICS issue with native libs

This commit is contained in:
Sylvain Berfini 2012-06-07 09:35:01 +02:00
parent 94e24a5230
commit d5cee9f44d
2 changed files with 2 additions and 2 deletions

View file

@ -49,7 +49,6 @@ prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-sr
generate-libs: generate-libs:
$(NDK_PATH)/ndk-build BUILD_SILK=1 -j$(NUMCPUS) $(NDK_PATH)/ndk-build BUILD_SILK=1 -j$(NUMCPUS)
rm $(TOPDIR)/libs/armeabi/liblinphone.so
update-project: update-project:
$(SDK_PATH)/android update project --path . $(SDK_PATH)/android update project --path .

View file

@ -116,8 +116,9 @@ ifeq ($(BUILD_SRTP), 1)
include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk
endif endif
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
endif
include $(linphone-root-dir)/submodules/linphone/build/android/Android-no-neon.mk include $(linphone-root-dir)/submodules/linphone/build/android/Android-no-neon.mk
_BUILD_AMR=0 _BUILD_AMR=0