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 7432a77222fff84be3c4e3b0d60bd16e23b7f2c0..10fba32dde675a67c35a4270ea8fa2491a2df79c 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -12,7 +12,7 @@
 ##  This program is distributed in the hope that it will be useful,
 ##  but WITHOUT ANY WARRANTY; without even the implied warranty of
 ##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##  GNU Library General Public License for more details.
+##  GNU General Public License for more details.
 ##
 ##  You should have received a copy of the GNU General Public License
 ##  along with this program; if not, write to the Free Software
@@ -20,73 +20,22 @@
 ##
 
 LOCAL_PATH:= $(call my-dir)/../../coreapi
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := liblinphone
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES = \
-       linphonecore.c \
-       misc.c  \
-       enum.c \
-       enum.h \
-       presence.c \
-       proxy.c \
-       friend.c \
-       authentication.c \
-       lpconfig.c \
-       chat.c \
-       general_state.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
-
-LOCAL_CFLAGS += \
-       -D_BYTE_ORDER=_LITTLE_ENDIAN \
-       -DORTP_INET6 \
-       -DENABLE_TRACE \
-       -DLINPHONE_VERSION=\"Linphone-3.3.x\" \
-       -DLINPHONE_PLUGINS_DIR=\"\\tmp\" \
-       -DLOG_DOMAIN=\"Linphone\"
-
-LOCAL_CFLAGS += -DIN_LINPHONE
-#LOCAL_CFLAGS += -DVIDEO_ENABLED -DIN_LINPHONE
 
-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 
+include $(CLEAR_VARS)
 
-LOCAL_LDLIBS += -llog
+include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
-LOCAL_STATIC_LIBRARIES := \
-       libmediastreamer2 \
-       libortp \
-       libspeex \
-       libeXosip2 \
-       libosip2 \
-       libgsm
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-   LOCAL_CFLAGS += -DHAVE_ILBC=1
-   LOCAL_STATIC_LIBRARIES += libmsilbc
+ifeq ($(LINPHONE_VIDEO),1)
+LOCAL_SHARED_LIBRARIES += \
+       libavcodec \
+       libswscale \
+       libavcore \
+       libavutil
 endif
-LOCAL_MODULE_CLASS = SHARED_LIBRARIES
-
-include $(BUILD_SHARED_LIBRARY)
-
-
 
+LOCAL_MODULE := liblinphone
 
+include $(BUILD_SHARED_LIBRARY)
 
+$(call import-module,android/cpufeatures)