Don't include xml2lpc and lpc2xml in android.mk

[linphone] / build / android / Android.mk

diff --git a/build/android/Android.mk b/build/android/Android.mk
index a7b9e024b3f515640f1a01d37169f51b47824e46..10fba32dde675a67c35a4270ea8fa2491a2df79c 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -21,95 +21,11 @@
 
 LOCAL_PATH:= $(call my-dir)/../../coreapi
 
-
 include $(CLEAR_VARS)
 
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := \
-       linphonecore.c \
-       misc.c  \
-       enum.c \
-       presence.c \
-       proxy.c \
-       friend.c \
-       authentication.c \
-       lpconfig.c \
-       chat.c \
-       sipsetup.c \
-       siplogin.c \
-       address.c \
-       linphonecore_jni.cc \
-       sal.c \
-       sal_eXosip2.c \
-       sal_eXosip2_presence.c \
-       sal_eXosip2_sdp.c \
-       offeranswer.c \
-       callbacks.c \
-       linphonecall.c \
-       conference.c \
-       ec-calibrator.c
-
-ifndef MY_LOG_DOMAIN
-MY_LOG_DOMAIN = \"Linphone\"
-endif
-
-LOCAL_CFLAGS += \
-       -D_BYTE_ORDER=_LITTLE_ENDIAN \
-       -DORTP_INET6 \
-        -DINET6 \
-        -DOSIP_MT \
-       -DENABLE_TRACE \
-       -DLINPHONE_VERSION=\"3.4.0\" \
-       -DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
-       -DLOG_DOMAIN=$(MY_LOG_DOMAIN) 
-
-LOCAL_CFLAGS += -DIN_LINPHONE
-
-
-ifeq ($(LINPHONE_VIDEO),1)
-LOCAL_CFLAGS += -DVIDEO_ENABLED
-ifeq ($(BUILD_X264),1)
-LOCAL_CFLAGS += -DHAVE_X264
-endif
-endif
-LOCAL_C_INCLUDES += \
-       $(LOCAL_PATH) \
-       $(LOCAL_PATH)/include \
-       $(LOCAL_PATH)/../oRTP/include \
-       $(LOCAL_PATH)/../mediastreamer2/include \
-       $(LOCAL_PATH)/../../externals/exosip/include \
-       $(LOCAL_PATH)/../../externals/osip/include 
-
-LOCAL_LDLIBS += -llog -ldl
-
-
-
-LOCAL_STATIC_LIBRARIES := \
-       cpufeatures \
-       libmediastreamer2 \
-       libortp \
-       libeXosip2 \
-       libosip2 \
-       libgsm 
-
-
-ifneq ($(BUILD_AMR),0)
-LOCAL_CFLAGS += -DHAVE_AMR
-
-LOCAL_STATIC_LIBRARIES += \
-       libmsamr \
-       libopencoreamr 
-endif
+include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
 ifeq ($(LINPHONE_VIDEO),1)
-LOCAL_LDLIBS    += -lGLESv2
-LOCAL_STATIC_LIBRARIES += libvpx
-ifeq ($(BUILD_X264),1)
-LOCAL_STATIC_LIBRARIES += \
-       libmsx264 \
-       libx264
-endif
 LOCAL_SHARED_LIBRARIES += \
        libavcodec \
        libswscale \
@@ -117,47 +33,9 @@ LOCAL_SHARED_LIBRARIES += \
        libavutil
 endif
 
-LOCAL_STATIC_LIBRARIES += libspeex 
-
-ifeq ($(BUILD_SRTP), 1)
-       LOCAL_C_INCLUDES += $(SRTP_C_INCLUDE)
-endif
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_CFLAGS += -DHAVE_ILBC=1
-LOCAL_STATIC_LIBRARIES += libmsilbc
-endif
-
-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_ABI),armeabi-v7a)
-       LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
-       ifeq ($(BUILD_GPLV3_ZRTP),1)
-       LOCAL_SHARED_LIBRARIES += libzrtpcpp
-       endif
-
-       ifeq ($(BUILD_SRTP),1)
-       LOCAL_SHARED_LIBRARIES += libsrtp
-       endif
-else
-       LOCAL_LDLIBS += -lz
-       #LOCAL_STATIC_LIBRARIES += libz libdl
-       LOCAL_STATIC_LIBRARIES += \
-               libssl-static libcrypto-static
-       ifeq ($(BUILD_GPLV3_ZRTP),1)
-               LOCAL_STATIC_LIBRARIES += libzrtpcpp-static
-       endif
-
-       ifeq ($(BUILD_SRTP),1)
-               LOCAL_STATIC_LIBRARIES += libsrtp-static
-       endif
-endif
-
 LOCAL_MODULE := liblinphone
+
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)
 
-