* #36042: remove LOCAL_LD_LIBS for static libraries

jni/Android.mk

@@ -178,8 +178,7 @@ LOCAL_LDLIBS  += -L$(APP_PROJECT_PATH)/obj/local/armeabi-v7a \
 
 # LOCAL_STATIC_LIBRARIES (NDK documentation)
 #   The list of static libraries modules (built with BUILD_STATIC_LIBRARY)
-#   that should be linked to this module. This only makes sense in
-#   shared library modules.
+#   that should be linked to this module. 
 LOCAL_STATIC_LIBRARIES += 	libpjsua-$(TARGET_NAME) \
 							libpjsip-ua-$(TARGET_NAME) \
 							libpjsip-simple-$(TARGET_NAME) \
@@ -195,13 +194,11 @@ LOCAL_STATIC_LIBRARIES += 	libpjsua-$(TARGET_NAME) \
 							libsamplerate \
 							libcrypto_static \
 							libsndfile \
+							libccrtp1 \
+							libexpat_shared \
+							libspeexresampler \
+							libyaml \
 						
-
-
-LOCAL_SHARED_LIBRARIES += libccrtp1 \
-				libexpat_shared \
-				libspeexresampler \
-				libyaml \
 				
 
 include $(BUILD_SHARED_LIBRARY)

jni/Application.mk

@@ -5,22 +5,6 @@ APP_OPTIM := debug
 APP_STL := gnustl_shared
 APP_ABI := armeabi-v7a
 
-#APP_MODULE += libopus
-APP_MODULES += libccgnu2
-APP_MODULES += libsamplerate
-
-#APP_MODULES += libexpat_static
-#APP_MODULES += libexpat_shared
-APP_MODULES += libccrtp1
-#APP_MODULES += libsndfile
-
-
-APP_MODULES += libpcre
-
-# APP_MODULES += libcrypto
-#APP_MODULES += libzrtpcpp
-
-APP_MODULES += libspeexresampler
 APP_MODULES += libcodec_ulaw
 APP_MODULES += libcodec_alaw
 APP_MODULES += libcodec_g722
@@ -29,5 +13,4 @@ APP_MODULES += libcodec_gsm
 APP_MODULES += libcodec_speex_nb
 APP_MODULES += libcodec_speex_ub
 APP_MODULES += libcodec_speex_wb
-
 APP_MODULES += libsflphone

jni/commoncpp2-android/Android.mk

@@ -51,5 +51,5 @@ LOCAL_SRC_FILES  := $(LOCAL_COMMONCPP_PATH)/thread.cpp \
 
 #LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 

jni/libccrtp/Android.mk

@@ -21,16 +21,12 @@ LOCAL_C_INCLUDES += $(MY_LOCAL_PATH)/src \
 					$(MY_OPENSSL)
 
 LOCAL_STATIC_LIBRARIES :=	libccgnu2 \
-							libcrypto
+							libcrypto_static
 
 LOCAL_MODULE     := libccrtp1
 
 LOCAL_SHARED_LIBRARIES += libssl_shared
 
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
-                    -L$(APP_PROJECT_PATH)/obj/local/armeabi \
-
-
 LOCAL_CPP_EXTENSION := .cxx .cpp
 
 SRTP_SRC_O = 	$(MY_LOCAL_PATH)/src/ccrtp/crypto/openssl/hmac.cpp \
@@ -65,4 +61,4 @@ LOCAL_SRC_FILES  := $(MY_LOCAL_PATH)/src/rtppkt.cpp \
 
 #LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

jni/libexpat/Android.mk

@@ -59,4 +59,4 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
 LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

jni/libgsm/Android.mk

@@ -24,8 +24,6 @@ LOCAL_C_INCLUDES := $(MY_LIBGSM)/inc
 
 LOCAL_MODULE := libgsm
 
-LOCAL_LDLIBS := -llog
-
 LOCAL_CPPFLAGS += $(NETWORKMANAGER) \
 					-DCCPP_PREFIX \
 					-DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \

jni/libopus/Android.mk

@@ -191,6 +191,4 @@ LOCAL_EXPORT_C_INCLUDES := $(MY_OPUS)/include
 
 LOCAL_MODULE := libopus
 
-LOCAL_LDLIBS := -llog 
-				
 include $(BUILD_STATIC_LIBRARY)

jni/libsamplerate/Android.mk

@@ -24,4 +24,4 @@ LOCAL_C_INCLUDES += $(MY_LIBSAMPLE)
 
 LOCAL_MODULE:= libsamplerate
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

jni/libyaml/Android.mk

@@ -11,8 +11,6 @@ LOCAL_CFLAGS := -DYAML_VERSION_STRING=\"0.1.4\" \
 
 LOCAL_MODULE     := libyaml
 
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib
-
 LOCAL_SRC_FILES  := $(MY_LIBYAML)/api.c \
 					$(MY_LIBYAML)/reader.c \
 					$(MY_LIBYAML)/scanner.c \
@@ -24,4 +22,4 @@ LOCAL_SRC_FILES  := $(MY_LIBYAML)/api.c \
 
 LOCAL_C_INCLUDES += $(MY_LIBYAML)/inc
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

jni/libzrtp/Android.mk

@@ -15,7 +15,6 @@ LOCAL_CPP_FEATURES := exceptions
 LOCAL_C_INCLUDES += $(MY_LIBZRTPCPP) \
 					$(MY_LIBZRTPCPP)/srtp \
 					$(MY_LIBZRTPCPP)/src \
-					/ucommon/inc/ \
 					$(APP_PROJECT_PATH)/jni/ucommon/inc \
 					$(MY_LIBZRTPCPP)/src/libzrtpcpp \
 					$(MY_OPENSSL)/include \