summaryrefslogtreecommitdiff
path: root/rules.mk
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2016-08-11 13:26:41 -0400
committerDavid Benjamin <davidben@google.com>2016-09-23 14:04:09 -0400
commit7c0d06c221ce9edf44bbf978b909b38a0aee2084 (patch)
tree493174506e099dc14252674dc832d9f11e58c4dc /rules.mk
parent7b550be7e74118580614c6aa5c414d7245d2f189 (diff)
downloadboringssl-7c0d06c221ce9edf44bbf978b909b38a0aee2084.tar.gz
external/boringssl: Sync to e34bcc91.
This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/0e9138d295cd556e830dc8b3be735e808680f4bd..e34bcc91c07c0bf65ecc53a814d51f5246007150 This also removes BORINGSSL_ENABLE_RC4_TLS and android_compat_hacks.c as they are no longer needed. Test: Built tree, phone boots. Ran cts-tradefed run cts -m CtsLibcoreTestCases Change-Id: I86df196e1856c338bbf72c60e2e47dd1b74ae537
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/rules.mk b/rules.mk
index 561d7a3e..adedd59e 100644
--- a/rules.mk
+++ b/rules.mk
@@ -44,7 +44,6 @@ include $(LOCAL_DIR)/crypto-sources.mk
# the functions defined in these files exists, the linker will be happy. If
# such a path is created, it'll be a link-time error and something more complex
# may need to be considered.
-LOCAL_SRC_FILES := $(filter-out android_compat_hacks.c,$(LOCAL_SRC_FILES))
LOCAL_SRC_FILES := $(filter-out src/crypto/bio/connect.c,$(LOCAL_SRC_FILES))
LOCAL_SRC_FILES := $(filter-out src/crypto/bio/fd.c,$(LOCAL_SRC_FILES))
LOCAL_SRC_FILES := $(filter-out src/crypto/bio/file.c,$(LOCAL_SRC_FILES))