From 5cd297e10ad3d71c52ae966b62b991bd2c18e8a1 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Jul 2014 10:41:01 +0200 Subject: [PATCH] Fix Android build --- jni/Application.mk | 2 +- submodules/externals/build/openh264/Android.mk | 4 ++-- submodules/linphone | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/Application.mk b/jni/Application.mk index 6ce48a283..69b5757bb 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -63,7 +63,7 @@ ifeq ($(BUILD_X264),1) APP_MODULES +=libx264 libmsx264 endif ifeq ($(BUILD_OPENH264),1) -APP_MODULES += libwels libmsopenh264 +APP_MODULES += libopenh264 libmsopenh264 endif ifeq ($(BUILD_MATROSKA), 1) APP_MODULES += libebml2 libmatroska2 diff --git a/submodules/externals/build/openh264/Android.mk b/submodules/externals/build/openh264/Android.mk index 02d140648..003843eb2 100644 --- a/submodules/externals/build/openh264/Android.mk +++ b/submodules/externals/build/openh264/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := libwels -LOCAL_SRC_FILES := $(TARGET_ARCH)/libwels.a +LOCAL_MODULE := libopenh264 +LOCAL_SRC_FILES := $(TARGET_ARCH)/libopenh264.a include $(PREBUILT_STATIC_LIBRARY) diff --git a/submodules/linphone b/submodules/linphone index de1852357..556b859e5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit de18523576bf1bc69e781ab0ac7a27295e0f3dbd +Subproject commit 556b859e5e46f47dd421c85582d553755ee3e9fa