diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
| commit | 626c2706b1f7abdc6af1216873b7687e59025d1f (patch) | |
| tree | 0617ebb1e49364082071482aa9a977dd1da45940 /main/openssl/rules.mk | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/rules.mk')
| -rw-r--r-- | main/openssl/rules.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/main/openssl/rules.mk b/main/openssl/rules.mk index c0c13e10..252dbbb3 100644 --- a/main/openssl/rules.mk +++ b/main/openssl/rules.mk @@ -1,7 +1,18 @@ LOCAL_DIR := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) -MODULE_USER := true + +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 @@ -9,16 +20,15 @@ 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 -TARGET_ARCH := $(ARCH) include $(LOCAL_DIR)/Crypto-config-trusty.mk -MODULE_SRCS += $(addprefix $(LOCAL_DIR)/,$(LOCAL_SRC_FILES_arm)) +MODULE_SRCS += $(addprefix $(LOCAL_DIR)/,$(LOCAL_SRC_FILES_$(ARCH))) MODULE_CFLAGS += $(LOCAL_CFLAGS) MODULE_CFLAGS += -Wno-error=implicit-function-declaration # Global for other modules which include openssl headers -GLOBAL_CFLAGS += -DOPENSSL_SYS_TRUSTY +GLOBAL_DEFINES += OPENSSL_SYS_TRUSTY LOCAL_C_INCLUDES := $(patsubst external/openssl/%,%,$(LOCAL_C_INCLUDES)) GLOBAL_INCLUDES += $(addprefix $(LOCAL_DIR)/,$(LOCAL_C_INCLUDES)) |