diff --git a/build/android/common.mk b/build/android/common.mk
index 235030d13..09cf9545a 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -188,9 +188,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
 LOCAL_SRC_FILES  += $(LIBLINPHONE_EXTENDED_SRC_FILES)
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-	LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
 	ifeq ($(BUILD_GPLV3_ZRTP),1)
-	LOCAL_SHARED_LIBRARIES += libzrtpcpp
+		LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
+		LOCAL_SHARED_LIBRARIES += libzrtpcpp
 	endif
 
 	ifeq ($(BUILD_SRTP),1)
@@ -199,10 +199,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 else
 	LOCAL_LDLIBS += -lz
 	#LOCAL_STATIC_LIBRARIES += libz libdl
-	LOCAL_STATIC_LIBRARIES += \
-		libssl-static libcrypto-static
+	
 	ifeq ($(BUILD_GPLV3_ZRTP),1)
 		LOCAL_STATIC_LIBRARIES += libzrtpcpp-static
+		LOCAL_STATIC_LIBRARIES += \
+		libssl-static libcrypto-static
 	endif
 
 	ifeq ($(BUILD_SRTP),1)