Build static libcrypto.
Change-Id: I8a6b108a3fca6999cb103867f781338c4ddea446
diff --git a/crypto/Android.mk b/crypto/Android.mk
index b0665e6..111374c 100644
--- a/crypto/Android.mk
+++ b/crypto/Android.mk
@@ -480,6 +480,8 @@
local_c_flags := -DNO_WINDOWS_BRAINDEATH
+#######################################
+
# target
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk
@@ -504,7 +506,8 @@
LOCAL_MODULE:= libcrypto
include $(BUILD_SHARED_LIBRARY)
-# host
+#######################################
+# host shared library
ifeq ($(WITH_HOST_DALVIK),true)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk
@@ -518,3 +521,18 @@
LOCAL_MODULE:= libcrypto
include $(BUILD_HOST_SHARED_LIBRARY)
endif
+
+########################################
+# host static library, which is used by some SDK tools.
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../android-config.mk
+LOCAL_SRC_FILES += $(local_src_files)
+LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
+LOCAL_C_INCLUDES += $(local_c_includes)
+LOCAL_SRC_FILES += $(non_arm_src_files)
+LOCAL_STATIC_LIBRARIES += libz
+LOCAL_LDLIBS += -ldl
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE:= libcrypto_static
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/patches/crypto_Android.mk b/patches/crypto_Android.mk
index c7983ad..111374c 100644
--- a/patches/crypto_Android.mk
+++ b/patches/crypto_Android.mk
@@ -480,6 +480,8 @@
local_c_flags := -DNO_WINDOWS_BRAINDEATH
+#######################################
+
# target
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk
@@ -500,10 +502,12 @@
else
LOCAL_SHARED_LIBRARIES += libdl
endif
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libcrypto
include $(BUILD_SHARED_LIBRARY)
-# host
+#######################################
+# host shared library
ifeq ($(WITH_HOST_DALVIK),true)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/../android-config.mk
@@ -513,6 +517,22 @@
LOCAL_SRC_FILES += $(non_arm_src_files)
LOCAL_STATIC_LIBRARIES += libz
LOCAL_LDLIBS += -ldl
+ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libcrypto
include $(BUILD_HOST_SHARED_LIBRARY)
endif
+
+########################################
+# host static library, which is used by some SDK tools.
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../android-config.mk
+LOCAL_SRC_FILES += $(local_src_files)
+LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
+LOCAL_C_INCLUDES += $(local_c_includes)
+LOCAL_SRC_FILES += $(non_arm_src_files)
+LOCAL_STATIC_LIBRARIES += libz
+LOCAL_LDLIBS += -ldl
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE:= libcrypto_static
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/patches/ssl_Android.mk b/patches/ssl_Android.mk
index f3fc03a..fb9d34c 100644
--- a/patches/ssl_Android.mk
+++ b/patches/ssl_Android.mk
@@ -49,6 +49,7 @@
LOCAL_SRC_FILES += $(local_src_files)
LOCAL_C_INCLUDES += $(local_c_includes)
LOCAL_SHARED_LIBRARIES += libcrypto
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libssl
include $(BUILD_SHARED_LIBRARY)
@@ -58,6 +59,7 @@
LOCAL_SRC_FILES += $(local_src_files)
LOCAL_C_INCLUDES += $(local_c_includes)
LOCAL_SHARED_LIBRARIES += libcrypto
+ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= libssl
include $(BUILD_HOST_SHARED_LIBRARY)
endif
