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/Apps-config-host.mk | 151 --------------------------------------- 2 files changed, 1 insertion(+), 151 deletions(-) create mode 160000 main/openssl delete mode 100644 main/openssl/Apps-config-host.mk (limited to 'main/openssl/Apps-config-host.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/Apps-config-host.mk b/main/openssl/Apps-config-host.mk deleted file mode 100644 index baf5a6a1..00000000 --- a/main/openssl/Apps-config-host.mk +++ /dev/null @@ -1,151 +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_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Apps-config-host.mk - -common_cflags := \ - -DMONOLITH \ - -common_src_files := \ - apps/app_rand.c \ - apps/apps.c \ - apps/asn1pars.c \ - apps/ca.c \ - apps/ciphers.c \ - apps/cms.c \ - apps/crl.c \ - apps/crl2p7.c \ - apps/dgst.c \ - apps/dh.c \ - apps/dhparam.c \ - apps/dsa.c \ - apps/dsaparam.c \ - apps/ec.c \ - apps/ecparam.c \ - apps/enc.c \ - apps/engine.c \ - apps/errstr.c \ - apps/gendh.c \ - apps/gendsa.c \ - apps/genpkey.c \ - apps/genrsa.c \ - apps/nseq.c \ - apps/ocsp.c \ - apps/openssl.c \ - apps/passwd.c \ - apps/pkcs12.c \ - apps/pkcs7.c \ - apps/pkcs8.c \ - apps/pkey.c \ - apps/pkeyparam.c \ - apps/pkeyutl.c \ - apps/prime.c \ - apps/rand.c \ - apps/req.c \ - apps/rsa.c \ - apps/rsautl.c \ - apps/s_cb.c \ - apps/s_client.c \ - apps/s_server.c \ - apps/s_socket.c \ - apps/s_time.c \ - apps/sess_id.c \ - apps/smime.c \ - apps/speed.c \ - apps/spkac.c \ - apps/srp.c \ - apps/verify.c \ - apps/version.c \ - apps/x509.c \ - -common_c_includes := \ - external/openssl/. \ - external/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 := - - -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) - -ifeq ($(HOST_OS),linux) -LOCAL_CFLAGS_x86 += $(x86_cflags) -LOCAL_SRC_FILES_x86 += $(filter-out $(x86_exclude_files), $(common_src_files) $(x86_src_files)) -LOCAL_CFLAGS_x86_64 += $(x86_64_cflags) -LOCAL_SRC_FILES_x86_64 += $(filter-out $(x86_64_exclude_files), $(common_src_files) $(x86_64_src_files)) -else -$(warning Unknown host OS $(HOST_OS)) -LOCAL_SRC_FILES += $(common_src_files) -endif -- cgit v1.2.3