#14407: keep latest update for ccrtp's and commoncpp's Android.mk

jni/ccrtp-1.8.0-android/src/Android.mk

@@ -12,8 +12,10 @@ SRTP_GCRYPT =
 LOCAL_CPPFLAGS   += -std=gnu++0x -fexceptions
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../commoncpp2-1.8.1-android/inc
 LOCAL_MODULE     := libccrtp1
-LOCAL_STATIC_LIBRARIES := libccgnu2
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib -lccgnu2
+LOCAL_SHARED_LIBRARIES := libccgnu2
+LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
+                    -L$(LOCAL_PATH)/../../../libs/armeabi \
+                    -lccgnu2
 LOCAL_CPP_EXTENSION := .cxx .cpp
 
 ifneq ($(SRTP_OPENSSL),)

jni/commoncpp2-1.8.1-android/src/Android.mk

@@ -22,5 +22,5 @@ LOCAL_SRC_FILES  := thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
 
 #LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
 

jni/dbus/bus/Android.mk

@@ -20,7 +20,7 @@ LOCAL_CFLAGS+=-DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\"
 # is also ignored in dbus-1.4.6.
 LOCAL_CFLAGS+=-Wno-address
 
-LOCAL_LDFLAGS += -lexpat
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../libs/armeabi -lexpat
 
 LOCAL_SRC_FILES:= \
 	activation.c \