diff --git a/jni/Application.mk b/jni/Application.mk index d22ce6c21154fe5357e40647f7f108e5996802fd..8e9b39218312f1508817a323614a2b3cefb6a2c3 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -3,7 +3,7 @@ APP_OPTIM := release APP_MODULES := libccgnu2 APP_MODULES += libyaml APP_MODULES += libsamplerate -APP_MODULES += libexpat_static +#APP_MODULES += libexpat_static APP_MODULES += libexpat_shared APP_MODULES += libccrtp1 #APP_MODULES += libcutils-static diff --git a/jni/libdbus-c++-0.9.0-android/tools/Android.mk b/jni/libdbus-c++-0.9.0-android/tools/Android.mk index b6aaa19f3b365931b3f0d269c3ca02a94e6a5a4f..dc39a7f910204605842aba514a721257c62f5fb4 100644 --- a/jni/libdbus-c++-0.9.0-android/tools/Android.mk +++ b/jni/libdbus-c++-0.9.0-android/tools/Android.mk @@ -14,8 +14,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include \ # FIXME Android NDK cannot build host tool, android sources needed... LOCAL_MODULE := dbusxx-xml2cpp LOCAL_CFLAGS += -Wall -LOCAL_STATIC_LIBRARIES += libexpat -LOCAL_LDFLAGS += -lexpat +LOCAL_SHARED_LIBRARIES += libexpat include $(BUILD_EXECUTABLE) @@ -30,8 +29,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_MODULE := dbusxx-introspect LOCAL_CFLAGS += -Wall -LOCAL_STATIC_LIBRARIES += libdbus-c++-1 -LOCAL_LDFLAGS += -ldbus-c++-1 +LOCAL_SHARED_LIBRARIES += libdbus-c++-1 include $(BUILD_EXECUTABLE)