From c3ae4aaac9f0b168aed063d3e86c5196608eaba1 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 15 Apr 2015 00:17:26 +0200 Subject: Move more to git, add submodules, fix build script, change hgignore to gitignore --- main/openssl | 1 + main/openssl/Ssl-config-target.mk | 162 -------------------------------------- 2 files changed, 1 insertion(+), 162 deletions(-) create mode 160000 main/openssl delete mode 100644 main/openssl/Ssl-config-target.mk (limited to 'main/openssl/Ssl-config-target.mk') diff --git a/main/openssl b/main/openssl new file mode 160000 index 00000000..4d377a9c --- /dev/null +++ b/main/openssl @@ -0,0 +1 @@ +Subproject commit 4d377a9ce111930d8a8f06dc0e94a892a7f6c516 diff --git a/main/openssl/Ssl-config-target.mk b/main/openssl/Ssl-config-target.mk deleted file mode 100644 index 481ef042..00000000 --- a/main/openssl/Ssl-config-target.mk +++ /dev/null @@ -1,162 +0,0 @@ -# Auto-generated - DO NOT EDIT! -# To regenerate, edit openssl.config, then run: -# ./import_openssl.sh import /path/to/openssl-1.0.1l.tar.gz -# -# This script will append to the following variables: -# -# LOCAL_CFLAGS -# LOCAL_C_INCLUDES -# LOCAL_SRC_FILES_$(TARGET_ARCH) -# LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) -# LOCAL_CFLAGS_$(TARGET_ARCH) -# LOCAL_CFLAGS_$(TARGET_2ND_ARCH) -# LOCAL_ADDITIONAL_DEPENDENCIES -# LOCAL_EXPORT_C_INCLUDE_DIRS - - -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Ssl-config-target.mk - -common_cflags := - -common_src_files := \ - ssl/bio_ssl.c \ - ssl/d1_both.c \ - ssl/d1_enc.c \ - ssl/d1_lib.c \ - ssl/d1_pkt.c \ - ssl/d1_srtp.c \ - ssl/kssl.c \ - ssl/s23_clnt.c \ - ssl/s23_lib.c \ - ssl/s23_meth.c \ - ssl/s23_pkt.c \ - ssl/s23_srvr.c \ - ssl/s2_clnt.c \ - ssl/s2_enc.c \ - ssl/s2_lib.c \ - ssl/s2_meth.c \ - ssl/s2_pkt.c \ - ssl/s2_srvr.c \ - ssl/s3_both.c \ - ssl/s3_cbc.c \ - ssl/s3_clnt.c \ - ssl/s3_enc.c \ - ssl/s3_lib.c \ - ssl/s3_meth.c \ - ssl/s3_pkt.c \ - ssl/s3_srvr.c \ - ssl/ssl_algs.c \ - ssl/ssl_asn1.c \ - ssl/ssl_cert.c \ - ssl/ssl_ciph.c \ - ssl/ssl_err.c \ - ssl/ssl_err2.c \ - ssl/ssl_lib.c \ - ssl/ssl_rsa.c \ - ssl/ssl_sess.c \ - ssl/ssl_stat.c \ - ssl/ssl_txt.c \ - ssl/t1_clnt.c \ - ssl/t1_enc.c \ - ssl/t1_lib.c \ - ssl/t1_meth.c \ - ssl/t1_reneg.c \ - ssl/t1_srvr.c \ - ssl/tls_srp.c \ - -common_c_includes := \ - openssl/. \ - 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 := - -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_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) - -LOCAL_SRC_FILES_mips64 += $(filter-out $(mips64_exclude_files),$(common_src_files) $(mips64_src_files)) -LOCAL_CFLAGS_mips64 += $(mips64_cflags) -LOCAL_CLANG_ASFLAGS_mips64 += $(mips64_clang_asflags) -- cgit v1.2.3