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:
Sylvain Berfini 2014-07-03 10:41:01 +02:00
parent 6ba461a739
commit 5cd297e10a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Application.mk
View file

@ -63,7 +63,7 @@ ifeq ($(BUILD_X264),1)
APP_MODULES +=libx264 libmsx264 APP_MODULES +=libx264 libmsx264
endif endif
ifeq ($(BUILD_OPENH264),1) ifeq ($(BUILD_OPENH264),1)
APP_MODULES += libwels libmsopenh264 APP_MODULES += libopenh264 libmsopenh264
endif endif
ifeq ($(BUILD_MATROSKA), 1) ifeq ($(BUILD_MATROSKA), 1)
APP_MODULES += libebml2 libmatroska2 APP_MODULES += libebml2 libmatroska2

4
submodules/externals/build/openh264/Android.mk vendored
View file

@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libwels LOCAL_MODULE := libopenh264
LOCAL_SRC_FILES := $(TARGET_ARCH)/libwels.a LOCAL_SRC_FILES := $(TARGET_ARCH)/libopenh264.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)

2
submodules/linphone

@ -1 +1 @@
Subproject commit de18523576bf1bc69e781ab0ac7a27295e0f3dbd Subproject commit 556b859e5e46f47dd421c85582d553755ee3e9fa