From 9f0928c6593f937a17b7974b04051c57e3874b20 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 12 Feb 2015 22:22:25 +0100 Subject: Update OpenSSL to AOSP -master --- main/openssl/Ssl-config-host.mk | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'main/openssl/Ssl-config-host.mk') diff --git a/main/openssl/Ssl-config-host.mk b/main/openssl/Ssl-config-host.mk index 83c60267..8f3bdce5 100644 --- a/main/openssl/Ssl-config-host.mk +++ b/main/openssl/Ssl-config-host.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.1j.tar.gz +# ./import_openssl.sh import /path/to/openssl-1.0.1l.tar.gz # # This script will append to the following variables: # @@ -11,6 +11,7 @@ # LOCAL_CFLAGS_$(TARGET_ARCH) # LOCAL_CFLAGS_$(TARGET_2ND_ARCH) # LOCAL_ADDITIONAL_DEPENDENCIES +# LOCAL_EXPORT_C_INCLUDE_DIRS LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Ssl-config-host.mk @@ -108,6 +109,30 @@ mips_src_files := mips_exclude_files := +mips64_clang_asflags := + +mips64_cflags := + +mips64_src_files := + +mips64_exclude_files := + +mips32r6_clang_asflags := + +mips32r6_cflags := + +mips32r6_src_files := + +mips32r6_exclude_files := + + +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include + +ifdef ARCH_MIPS_REV6 +mips_cflags := $(mips32r6_cflags) +mips_src_files := $(mips32r6_src_files) +mips_exclude_files := $(mips32r6_exclude_files) +endif LOCAL_CFLAGS += $(common_cflags) LOCAL_C_INCLUDES += $(common_c_includes) $(local_c_includes) -- cgit v1.2.3