Commit 4c34a2c7 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Build video support on x86 platform.

parent b050b229
......@@ -23,6 +23,7 @@ LOCAL_PATH:= $(call my-dir)/../../coreapi
include $(CLEAR_VARS)
ifeq ($(TARGET_ARCH), arm)
include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
ifeq ($(_BUILD_VIDEO),1)
......@@ -32,6 +33,7 @@ LOCAL_SHARED_LIBRARIES += \
liblinavcore \
liblinavutil
endif
endif
LOCAL_MODULE := liblinphonenoneon
ifeq ($(TARGET_ARCH_ABI),armeabi)
......@@ -40,9 +42,6 @@ endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
endif
ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_MODULE_FILENAME := liblinphonex86
endif
include $(BUILD_SHARED_LIBRARY)
......
......@@ -37,6 +37,9 @@ LOCAL_MODULE := liblinphone
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE_FILENAME := liblinphonearmv7
endif
ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_MODULE_FILENAME := liblinphonex86
endif
include $(BUILD_SHARED_LIBRARY)
......
......@@ -184,6 +184,7 @@ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES)
ifeq ($(TARGET_ARCH), arm)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
......@@ -207,6 +208,17 @@ else
LOCAL_STATIC_LIBRARIES += libsrtp-static
endif
endif
endif
ifeq ($(TARGET_ARCH), x86)
ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
LOCAL_SHARED_LIBRARIES += libzrtpcpp
endif
ifeq ($(BUILD_SRTP),1)
LOCAL_SHARED_LIBRARIES += libsrtp
endif
endif
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
LOCAL_SRC_FILES += ../tools/xml2lpc.c \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment