From cf2c2337e334c4de95d3fca4732e996c9e2d0e3a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 24 Apr 2013 11:57:52 +0200 Subject: [PATCH] link to libxml2 statically (shared version not working with android-ndk-r8e) --- build/android/common.mk | 4 +++- build/android/lpc2xml.mk | 1 - build/android/xml2lpc.mk | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/android/common.mk b/build/android/common.mk index 58464973..d0bf70ca 100644 --- a/build/android/common.mk +++ b/build/android/common.mk @@ -95,10 +95,12 @@ LOCAL_STATIC_LIBRARIES := \ libeXosip2 \ libosip2 \ libgsm + ifeq ($(BUILD_REMOTE_PROVISIONING),1) LOCAL_STATIC_LIBRARIES += \ libxml2lpc \ - liblpc2xml + liblpc2xml \ + liblpxml2 endif ifeq ($(BUILD_TUNNEL),1) diff --git a/build/android/lpc2xml.mk b/build/android/lpc2xml.mk index 91038adc..d93be9b7 100644 --- a/build/android/lpc2xml.mk +++ b/build/android/lpc2xml.mk @@ -39,7 +39,6 @@ LOCAL_C_INCLUDES = \ $(LOCAL_PATH)/../../externals/build/libxml2 \ LOCAL_SHARED_LIBRARIES = \ - libxml2 # liblinphonenoneon \ # liblinphone \ diff --git a/build/android/xml2lpc.mk b/build/android/xml2lpc.mk index e89ab383..55e4a03a 100644 --- a/build/android/xml2lpc.mk +++ b/build/android/xml2lpc.mk @@ -39,7 +39,6 @@ LOCAL_C_INCLUDES = \ $(LOCAL_PATH)/../../externals/build/libxml2 \ LOCAL_SHARED_LIBRARIES = \ - libxml2 # liblinphonenoneon \ # liblinphone \ -- 2.39.2