diff options
author | Kenny Root <kroot@google.com> | 2015-10-02 16:09:15 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2015-10-02 16:09:49 -0700 |
commit | fe7305364c3369f9222a61646c5c9842eae9bceb (patch) | |
tree | 360ada970b7bb1046ae069d253ba24d9622eb3ad /crypto-sources.mk | |
parent | 691ef9d0ff0ece39ffd6a58960a7cd195ef584ae (diff) | |
parent | b452bce3bf2034466cee6206ebf3994409468ee4 (diff) | |
download | external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.zip external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.gz external_boringssl-fe7305364c3369f9222a61646c5c9842eae9bceb.tar.bz2 |
Merge mnc-dr-dev-plus-aosp into mnc-ub-dev
This pulls in the latest version of BoringSSL.
Change-Id: I0ab5c73d60f41a696c9a828fac87670aaca10dec
Diffstat (limited to 'crypto-sources.mk')
-rw-r--r-- | crypto-sources.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/crypto-sources.mk b/crypto-sources.mk index 78194f2..a5b8ba3 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -1,12 +1,16 @@ 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 (,$(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) |