android: first publishable implementation of Ring on Android
Change-Id: I6d65993a0bbed0ac680d6fe5980aae0fb931116e
diff --git a/ring-android/app/src/main/jni/Android.mk b/ring-android/app/src/main/jni/Android.mk
index 37b98fd..7f63ff5 100644
--- a/ring-android/app/src/main/jni/Android.mk
+++ b/ring-android/app/src/main/jni/Android.mk
@@ -43,7 +43,6 @@
ARCH=$(ANDROID_ABI)
CPP_STATIC= $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++$(CXXSTL)/libs/$(ARCH)/libgnustl_static.a \
- $(RING_CONTRIB)/lib/libexpat.a \
$(RING_CONTRIB)/lib/libgnutls.a \
$(RING_CONTRIB)/lib/libnettle.a \
$(RING_CONTRIB)/lib/libhogweed.a \
@@ -82,12 +81,14 @@
LOCAL_MODULE := libringjni
+LOCAL_CFLAGS += -fpic
+
LOCAL_CPPFLAGS += -DCCPP_PREFIX \
-DPROGSHAREDIR=\"${MY_DATADIR}/ring\" \
-DHAVE_CONFIG_H \
-DHAVE_SPEEX_CODEC \
-DHAVE_GSM_CODEC \
- -w -frtti \
+ -w -frtti -fpic \
-std=c++11 -fexceptions -fpermissive \
-DAPP_NAME=\"Ring\" \
-DSWIG_JAVA_ATTACH_CURRENT_THREAD_AS_DAEMON \
@@ -127,7 +128,7 @@
-lresample-arm-unknown-linux-androideabi
endif
-LOCAL_LDLIBS += -lexpat -lhogweed \
+LOCAL_LDLIBS += -lhogweed \
-lspeexdsp -lvorbisfile -lyaml-cpp \
-lFLAC -liax -lnettle \
-logg \