From 08656b61d075740bfb24ddcce65223146259fc02 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 18 Aug 2015 17:47:53 -0700 Subject: Whitelist windows modules And stop changing variables based on HOST_OS. Bug: 23566667 Change-Id: I3b3b2f0aef066eb224cb1fa6f2e9f32c32695711 --- crypto-sources.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'crypto-sources.mk') diff --git a/crypto-sources.mk b/crypto-sources.mk index 78194f2..7d9319c 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -3,10 +3,13 @@ include $(LOCAL_PATH)/sources.mk LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter # Do not add in the architecture-specific files if we don't want to build assembly -ifeq (,$(filter -DOPENSSL_NO_ASM,$(LOCAL_CFLAGS))) -LOCAL_SRC_FILES_x86 = $(linux_x86_sources) -LOCAL_SRC_FILES_x86_64 = $(linux_x86_64_sources) -LOCAL_SRC_FILES_arm = $(linux_arm_sources) -LOCAL_SRC_FILES_arm64 = $(linux_aarch64_sources) +ifeq ($(LOCAL_IS_HOST_MODULE),true) +LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources) +LOCAL_SRC_FILES_linux_x86_64 := $(linux_x86_64_sources) +else +LOCAL_SRC_FILES_x86 := $(linux_x86_sources) +LOCAL_SRC_FILES_x86_64 := $(linux_x86_64_sources) +LOCAL_SRC_FILES_arm := $(linux_arm_sources) +LOCAL_SRC_FILES_arm64 := $(linux_aarch64_sources) endif LOCAL_SRC_FILES += $(crypto_sources) -- cgit v1.1 From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- crypto-sources.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crypto-sources.mk') diff --git a/crypto-sources.mk b/crypto-sources.mk index 7d9319c..a5b8ba3 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -1,7 +1,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk include $(LOCAL_PATH)/sources.mk -LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter +LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM +LOCAL_ASFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter # Do not add in the architecture-specific files if we don't want to build assembly ifeq ($(LOCAL_IS_HOST_MODULE),true) LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources) -- cgit v1.1 From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 00:26:37 +0000 Subject: Revert "external/boringssl: sync with upstream." This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25 --- crypto-sources.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'crypto-sources.mk') diff --git a/crypto-sources.mk b/crypto-sources.mk index a5b8ba3..7d9319c 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -1,8 +1,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk include $(LOCAL_PATH)/sources.mk -LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM -LOCAL_ASFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter +LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter # Do not add in the architecture-specific files if we don't want to build assembly ifeq ($(LOCAL_IS_HOST_MODULE),true) LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources) -- cgit v1.1 From b8494591d1b1a143f3b192d845c238bbf3bc629d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 02:29:14 +0000 Subject: Revert "Revert "external/boringssl: sync with upstream."" This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88 --- crypto-sources.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crypto-sources.mk') diff --git a/crypto-sources.mk b/crypto-sources.mk index 7d9319c..a5b8ba3 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -1,7 +1,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk include $(LOCAL_PATH)/sources.mk -LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter +LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM +LOCAL_ASFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter # Do not add in the architecture-specific files if we don't want to build assembly ifeq ($(LOCAL_IS_HOST_MODULE),true) LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources) -- cgit v1.1