Revert "Give unique name to host build shared libraries"

Breaks build on Replicant 4.2
Needs to be reverted again when Replicant moves to 4.4!

This reverts commit 32e8f93ccd0aad87b5570b88f3ce5f1ea7530be3.

Change-Id: Ied814982f2d33f7c9bd54e34a176fe8fcaac33c7

3 files changed, 9 insertions, 5 deletions

diff --git a/Apps.mk b/Apps.mk
index 0acf046..5962a6f 100644
--- a/Apps.mk
+++ b/Apps.mk
@@ -2,6 +2,10 @@
 
 LOCAL_PATH:= $(call my-dir)
 
+local_shared_libraries := \
+	libssl \
+	libcrypto
+
 local_c_includes :=
 local_c_flags :=
 
@@ -14,7 +18,7 @@ LOCAL_MODULE:= openssl
 LOCAL_CLANG := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(target_src_files)
-LOCAL_SHARED_LIBRARIES := libssl libcrypto
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
 LOCAL_C_INCLUDES := $(target_c_includes)
 LOCAL_CFLAGS := $(target_c_flags)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
@@ -25,7 +29,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= openssl
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(host_src_files)
-LOCAL_SHARED_LIBRARIES := libssl-host libcrypto-host
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
 LOCAL_C_INCLUDES := $(host_c_includes)
 LOCAL_CFLAGS := $(host_c_flags)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
diff --git a/Crypto.mk b/Crypto.mk
index 7bb313b..522ee62 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -65,7 +65,7 @@ LOCAL_CFLAGS += $(host_c_flags) -DPURIFY
 LOCAL_C_INCLUDES += $(host_c_includes)
 LOCAL_LDLIBS += -ldl
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto-host
+LOCAL_MODULE:= libcrypto
 LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
 include $(BUILD_HOST_SHARED_LIBRARY)
 
diff --git a/Ssl.mk b/Ssl.mk
index 47ccf14..d7e1204 100644
--- a/Ssl.mk
+++ b/Ssl.mk
@@ -59,9 +59,9 @@ include $(LOCAL_PATH)/android-config.mk
 LOCAL_SRC_FILES += $(host_src_files)
 LOCAL_CFLAGS += $(host_c_flags)
 LOCAL_C_INCLUDES += $(host_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto-host $(log_shared_libraries)
+LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl-host
+LOCAL_MODULE:= libssl
 LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
 include $(BUILD_HOST_SHARED_LIBRARY)