#14465: Activate srtp in libccrtp and link with sflphoned

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

-LOCAL_PATH := $(call my-dir)
+MY_LOCAL_PATH := $(call my-dir)
+
+include $(call all-subdir-makefiles)
+
+LOCAL_PATH := $(MY_LOCAL_PATH)
 
 include $(CLEAR_VARS)
 
@@ -10,19 +14,20 @@ SRTP_GCRYPT =
 
 #LOCAL_CPPFLAGS   += -Wno-psabi -frtti -pthread -fexceptions
 LOCAL_CPPFLAGS   += -std=gnu++0x -fexceptions
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../commoncpp2-1.8.1-android/inc
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../commoncpp2-1.8.1-android/inc \
+		    $(LOCAL_PATH)/../../openssl/include
 LOCAL_MODULE     := libccrtp1
 LOCAL_SHARED_LIBRARIES := libccgnu2
 LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
                     -L$(APP_PROJECT_PATH)/obj/local/armeabi \
-                    -lccgnu2
+                    -lccgnu2 \
+		    -lssl \
+		    -lcrypto
 LOCAL_CPP_EXTENSION := .cxx .cpp
 
-ifneq ($(SRTP_OPENSSL),)
 SRTP_SRC_O = 	ccrtp/crypto/openssl/hmac.cpp \
 				ccrtp/crypto/openssl/AesSrtp.cxx \
 				ccrtp/crypto/openssl/InitializeOpenSSL.cxx
-endif
 
 ifneq ($(SRTP_GCRYPT),)
 SRTP_SRC_G =    ccrtp/crypto/gcrypt/gcrypthmac.cxx \

jni/ccrtp-1.8.0-android/src/config.h

@@ -20,13 +20,13 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the <openssl/aes.h> header file. */
-/* #undef HAVE_OPENSSL_AES_H */
+#define HAVE_OPENSSL_AES_H 1
 
 /* Define to 1 if you have the <openssl/bn.h> header file. */
-/* #undef HAVE_OPENSSL_BN_H */
+#define HAVE_OPENSSL_BN_H 1
 
 /* Define to 1 if you have the <openssl/sha.h> header file. */
-/* #undef HAVE_OPENSSL_SHA_H */
+#define HAVE_OPENSSL_SHA_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -75,7 +75,7 @@
 #define PACKAGE_VERSION ""
 
 /* SRTP support */
-/* #undef SRTP_SUPPORT */
+#define SRTP_SUPPORT 1
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1