summaryrefslogtreecommitdiff
path: root/main/openssl/Ssl.mk
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-06-24 11:12:30 +0200
committerArne Schwabe <arne@rfc2549.org>2014-06-24 11:12:30 +0200
commiteb7891f0af9b787202e91e903b612eb2467ca870 (patch)
treedd2ad0eac533dca54f6ae2231430052bf8860a9d /main/openssl/Ssl.mk
parent830aec478ff774bf8beeb321f5f67a08a133e95f (diff)
Update OpenSSL to aosp/master
--HG-- extra : amend_source : 1d737bc919a18f072b1038b548a2cbad4cf76e22
Diffstat (limited to 'main/openssl/Ssl.mk')
-rw-r--r--main/openssl/Ssl.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/main/openssl/Ssl.mk b/main/openssl/Ssl.mk
index 8ce82d9b..6c04950a 100644
--- a/main/openssl/Ssl.mk
+++ b/main/openssl/Ssl.mk
@@ -12,7 +12,7 @@ LOCAL_CFLAGS += $(target_c_flags)
LOCAL_C_INCLUDES += $(target_c_includes)
LOCAL_SHARED_LIBRARIES = $(log_shared_libraries)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl_static
+LOCAL_MODULE := libssl_static
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
include $(LOCAL_PATH)/Ssl-config-target.mk
include $(LOCAL_PATH)/android-config.mk
@@ -35,19 +35,20 @@ endif
LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl
+LOCAL_MODULE := libssl
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
include $(LOCAL_PATH)/Ssl-config-target.mk
include $(LOCAL_PATH)/android-config.mk
include $(LOCAL_PATH)/ndk-build.mk
include $(BUILD_SHARED_LIBRARY)
+
# #######################################
# # host shared library
# include $(CLEAR_VARS)
# LOCAL_SHARED_LIBRARIES += libcrypto-host $(log_shared_libraries)
# LOCAL_MODULE_TAGS := optional
-# LOCAL_MODULE:= libssl-host
+# LOCAL_MODULE := libssl-host
# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
# include $(LOCAL_PATH)/Ssl-config-host.mk
# include $(LOCAL_PATH)/android-config.mk
@@ -56,9 +57,12 @@ include $(BUILD_SHARED_LIBRARY)
# #######################################
# # ssltest
# include $(CLEAR_VARS)
-# LOCAL_SRC_FILES:= ssl/ssltest.c
+# LOCAL_SRC_FILES := ssl/ssltest.c
# LOCAL_SHARED_LIBRARIES := libssl libcrypto $(log_shared_libraries)
-# LOCAL_MODULE:= ssltest
+# LOCAL_MODULE := ssltest
+# LOCAL_MULTILIB := both
+# LOCAL_MODULE_STEM_32 := ssltest
+# LOCAL_MODULE_STEM_64 := ssltest64
# LOCAL_MODULE_TAGS := optional
# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
# include $(LOCAL_PATH)/Ssl-config-host.mk