Don't include xml2lpc and lpc2xml in android.mk

diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index d0c87b4f82bf15e0bf7e9e4b52616fd84c8befde..d8e75ca0b9aeb9805bc395ed313008bd351e3fe8 100644 (file)
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -21,7 +21,6 @@
 
 LOCAL_PATH:= $(call my-dir)/../../coreapi
 
-
 include $(CLEAR_VARS)
 
 include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
@@ -43,4 +42,3 @@ include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)
 
-

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 7fb75d0a4dce209506ec2d19da1348eb3f6fdcc8..10fba32dde675a67c35a4270ea8fa2491a2df79c 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -39,10 +39,3 @@ include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/cpufeatures)
 
-
-ifeq ($(BUILD_REMOTE_PROVISIONING),1)
-
-include $(linphone-root-dir)/submodules/linphone/build/android/xml2lpc.mk
-include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk
-
-endif

diff --git a/build/android/lpc2xml.mk b/build/android/lpc2xml.mk
index f7858f94db8a3c0d1c85ad0d59a002a8d4bc0366..b5757ad99ed45bb1a5997f0ce710561a5594911c 100644 (file)
--- a/build/android/lpc2xml.mk
+++ b/build/android/lpc2xml.mk
@@ -40,6 +40,7 @@ LOCAL_C_INCLUDES = \
 
 LOCAL_SHARED_LIBRARIES = \
        libxml2 \
+       liblinphonenoneon \
        liblinphone \
 
 LOCAL_MODULE := liblpc2xml

diff --git a/build/android/xml2lpc.mk b/build/android/xml2lpc.mk
index 32bfb38c33947385a4307305626961d4ebd243e3..449251cc827d76096f0896692e7b402e16033c6c 100644 (file)
--- a/build/android/xml2lpc.mk
+++ b/build/android/xml2lpc.mk
@@ -40,6 +40,7 @@ LOCAL_C_INCLUDES = \
 
 LOCAL_SHARED_LIBRARIES = \
        libxml2 \
+       liblinphonenoneon \
        liblinphone \
 
 LOCAL_MODULE := libxml2lpc