summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-03-09 23:04:59 +0000
committerKenny Root <kroot@google.com>2015-03-09 23:04:59 +0000
commitb48f1a97e6048550d14de1da735db04f3c4ea582 (patch)
tree1e52431cf26731c0f1e662b5d9efd48b3c126ea8
parent8c9e4b3cae8d2b71f02f601b20ef692426c45a87 (diff)
downloadmanifest-b48f1a97e6048550d14de1da735db04f3c4ea582.tar.gz
Revert "Revert "Revert "Switch to BoringSSL DO NOT MERGE"""
Qualcomm blobs using symbols in OpenSSL that it shouldn't be using. This reverts commit 8c9e4b3cae8d2b71f02f601b20ef692426c45a87. Change-Id: Ifa8a8025525002873888acd6dbadc6aafe722b64
-rw-r--r--default.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index e43b4ad21..3d826afe7 100644
--- a/default.xml
+++ b/default.xml
@@ -67,7 +67,6 @@
<project path="external/bison" name="platform/external/bison" groups="pdk" />
<project path="external/blktrace" name="platform/external/blktrace" groups="pdk-cw-fs" />
<project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="pdk" />
- <project path="external/boringssl" name="platform/external/boringssl" groups="pdk" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" groups="pdk" />
<project path="external/bsdiff" name="platform/external/bsdiff" groups="pdk" />
<project path="external/bzip2" name="platform/external/bzip2" groups="pdk" />
@@ -231,6 +230,7 @@
<project path="external/objenesis" name="platform/external/objenesis" groups="pdk-cw-fs" />
<project path="external/okhttp" name="platform/external/okhttp" groups="pdk-cw-fs" />
<project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs" />
+ <project path="external/openssl" name="platform/external/openssl" groups="pdk" />
<project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" />
<project path="external/pcre" name="platform/external/pcre" groups="pdk-cw-fs" />
<project path="external/pdfium" name="platform/external/pdfium" groups="pdk-cw-fs" />