diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
| commit | b8494591d1b1a143f3b192d845c238bbf3bc629d (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /crypto-sources.mk | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2 | |
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7.
Underlying issue was fixed.
Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'crypto-sources.mk')
| -rw-r--r-- | crypto-sources.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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) |