summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-03-04 17:04:51 +0000
committerKenny Root <kroot@google.com>2015-03-04 17:04:51 +0000
commitd80795d1d3064f97a9ef572fc2897ee453e0442c (patch)
treec3259ccbce9cf463e6484de5803967ab0c72bead
parentd9615640484b68059d60b71045eab51794eac56e (diff)
downloadmanifest-d80795d1d3064f97a9ef572fc2897ee453e0442c.tar.gz
Revert "Switch to BoringSSL DO NOT MERGE"
This reverts commit d9615640484b68059d60b71045eab51794eac56e. Build broken in win_sdk aosp_x86_64 mac_sdk Change-Id: I6a2b3aa526e070a7f2e1bb314066bfb9624e8a17
-rw-r--r--default.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index 12520bc18..103c90a23 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" />
@@ -229,6 +228,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" />