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/rules.mk | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) create mode 160000 main/openssl delete mode 100644 main/openssl/rules.mk (limited to 'main/openssl/rules.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/rules.mk b/main/openssl/rules.mk deleted file mode 100644 index 1c3ae64f..00000000 --- a/main/openssl/rules.mk +++ /dev/null @@ -1,42 +0,0 @@ -LOCAL_DIR := $(GET_LOCAL_DIR) - -MODULE := $(LOCAL_DIR) - -TARGET_ARCH := $(ARCH) -TARGET_2ND_ARCH := $(ARCH) - -# Reset local 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 := - -# get openssl_cflags -MODULE_SRCDEPS += $(LOCAL_DIR)/build-config-trusty.mk -include $(LOCAL_DIR)/build-config-trusty.mk - -# get target_c_flags, target_c_includes, target_src_files -MODULE_SRCDEPS += $(LOCAL_DIR)/Crypto-config-trusty.mk -include $(LOCAL_DIR)/Crypto-config-trusty.mk - -MODULE_SRCS += $(addprefix $(LOCAL_DIR)/,$(LOCAL_SRC_FILES_$(ARCH))) - -MODULE_CFLAGS += $(LOCAL_CFLAGS) -MODULE_CFLAGS += -Wno-error=implicit-function-declaration -MODULE_CFLAGS += -Wno-empty-body -MODULE_CFLAGS += -Wno-missing-field-initializers - -# Global for other modules which include openssl headers -GLOBAL_DEFINES += OPENSSL_SYS_TRUSTY - -LOCAL_C_INCLUDES := $(patsubst external/openssl/%,%,$(LOCAL_C_INCLUDES)) -GLOBAL_INCLUDES += $(addprefix $(LOCAL_DIR)/,$(LOCAL_C_INCLUDES)) - -MODULE_DEPS := \ - lib/openssl-stubs \ - lib/libc-trusty - -include make/module.mk -- cgit v1.2.3