summaryrefslogtreecommitdiff
path: root/main/openssl/Ssl-config-target.mk
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-11-14 09:52:32 +0100
committerArne Schwabe <arne@rfc2549.org>2014-11-14 09:52:32 +0100
commitb28828796ad6d65ac463b41bba153f74e4531a6b (patch)
tree154b9f7436ae575e324f3374a5145e451bf649a8 /main/openssl/Ssl-config-target.mk
parente7a6c1a987ebee1ddb2f908ca028d613a5c52490 (diff)
Update OpenSSL version
Diffstat (limited to 'main/openssl/Ssl-config-target.mk')
-rw-r--r--main/openssl/Ssl-config-target.mk17
1 files changed, 16 insertions, 1 deletions
diff --git a/main/openssl/Ssl-config-target.mk b/main/openssl/Ssl-config-target.mk
index c08a971d..bf1671f0 100644
--- a/main/openssl/Ssl-config-target.mk
+++ b/main/openssl/Ssl-config-target.mk
@@ -1,6 +1,6 @@
# Auto-generated - DO NOT EDIT!
# To regenerate, edit openssl.config, then run:
-# ./import_openssl.sh import /path/to/openssl-1.0.1h.tar.gz
+# ./import_openssl.sh import /path/to/openssl-1.0.1j.tar.gz
#
# This script will append to the following variables:
#
@@ -68,30 +68,40 @@ common_c_includes := \
openssl/crypto \
openssl/include \
+arm_clang_asflags :=
+
arm_cflags :=
arm_src_files :=
arm_exclude_files :=
+arm64_clang_asflags :=
+
arm64_cflags :=
arm64_src_files :=
arm64_exclude_files :=
+x86_clang_asflags :=
+
x86_cflags :=
x86_src_files :=
x86_exclude_files :=
+x86_64_clang_asflags :=
+
x86_64_cflags :=
x86_64_src_files :=
x86_64_exclude_files :=
+mips_clang_asflags :=
+
mips_cflags :=
mips_src_files :=
@@ -104,15 +114,20 @@ LOCAL_C_INCLUDES += $(common_c_includes)
LOCAL_SRC_FILES_arm += $(filter-out $(arm_exclude_files),$(common_src_files) $(arm_src_files))
LOCAL_CFLAGS_arm += $(arm_cflags)
+LOCAL_CLANG_ASFLAGS_arm += $(arm_clang_asflags)
LOCAL_SRC_FILES_arm64 += $(filter-out $(arm64_exclude_files),$(common_src_files) $(arm64_src_files))
LOCAL_CFLAGS_arm64 += $(arm64_cflags)
+LOCAL_CLANG_ASFLAGS_arm64 += $(arm64_clang_asflags)
LOCAL_SRC_FILES_x86 += $(filter-out $(x86_exclude_files),$(common_src_files) $(x86_src_files))
LOCAL_CFLAGS_x86 += $(x86_cflags)
+LOCAL_CLANG_ASFLAGS_x86 += $(x86_clang_asflags)
LOCAL_SRC_FILES_x86_64 += $(filter-out $(x86_64_exclude_files),$(common_src_files) $(x86_64_src_files))
LOCAL_CFLAGS_x86_64 += $(x86_64_cflags)
+LOCAL_CLANG_ASFLAGS_x86_64 += $(x86_64_clang_asflags)
LOCAL_SRC_FILES_mips += $(filter-out $(mips_exclude_files),$(common_src_files) $(mips_src_files))
LOCAL_CFLAGS_mips += $(mips_cflags)
+LOCAL_CLANG_ASFLAGS_mips += $(mips_clang_asflags)