diff options
| author | Kenny Root <kroot@google.com> | 2015-10-02 17:37:41 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-10-02 17:40:09 -0700 |
| commit | b58f8d1fed1cfc47760125d23160ca78f364722b (patch) | |
| tree | a95c347114d34e87826c3c3811e3410bb24d2f10 /crypto-sources.mk | |
| parent | fe7305364c3369f9222a61646c5c9842eae9bceb (diff) | |
| download | external_boringssl-b58f8d1fed1cfc47760125d23160ca78f364722b.zip external_boringssl-b58f8d1fed1cfc47760125d23160ca78f364722b.tar.gz external_boringssl-b58f8d1fed1cfc47760125d23160ca78f364722b.tar.bz2 | |
DO NOT MERGE ANYWHERE Revert "Whitelist windows modules"
This is only needed in the mnc-ub-dev branch to deal with the older
build project.
This reverts commit 08656b61d075740bfb24ddcce65223146259fc02.
Change-Id: I7440e3d6371e6d98f1f77705f8bf374e7f37fbe2
Diffstat (limited to 'crypto-sources.mk')
| -rw-r--r-- | crypto-sources.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crypto-sources.mk b/crypto-sources.mk index a5b8ba3..d90d109 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -4,13 +4,10 @@ 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 # 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) -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) +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) endif LOCAL_SRC_FILES += $(crypto_sources) |