From cd96b8ba6695890d61f55b3b070b09265d4e2b37 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 23 May 2012 17:37:01 +0200 Subject: [PATCH] Renamed liblinphone for armv5 + fix compilation issue --- build/android/Android-no-neon.mk | 10 +++++++--- build/android/Android.mk | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk index 970e8bc8..3d72ffc5 100644 --- a/build/android/Android-no-neon.mk +++ b/build/android/Android-no-neon.mk @@ -28,11 +28,15 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk LOCAL_SHARED_LIBRARIES += \ libavcodecnoneon \ - libswscalenoneon \ - libavcorenoneon \ - libavutilnoneon + libswscale \ + libavcore \ + libavutil LOCAL_MODULE := liblinphonenoneon +ifeq ($(TARGET_ARCH_ABI),armeabi) +LOCAL_MODULE_FILENAME := liblinphonearmv5 +endif + include $(BUILD_SHARED_LIBRARY) $(call import-module,android/cpufeatures) diff --git a/build/android/Android.mk b/build/android/Android.mk index 903a0516..54936761 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -26,7 +26,14 @@ include $(CLEAR_VARS) include $(linphone-root-dir)/submodules/linphone/build/android/common.mk +LOCAL_SHARED_LIBRARIES += \ + libavcodec \ + libswscale \ + libavcore \ + libavutil + LOCAL_MODULE := liblinphone + include $(BUILD_SHARED_LIBRARY) $(call import-module,android/cpufeatures) -- 2.39.2