From 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 24 Sep 2015 10:57:52 -0700 Subject: external/boringssl: sync with upstream. This change imports the current version of BoringSSL. The only local change now is that |BORINGSSL_201509| is defined in base.h. This allows this change to be made without (hopefully) breaking the build. This change will need https://android-review.googlesource.com/172744 to be landed afterwards to update a test. Change-Id: I6d1f463f7785a2423bd846305af91c973c326104 --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 UPDATING (limited to 'UPDATING') diff --git a/UPDATING b/UPDATING new file mode 100644 index 0000000..17af66d --- /dev/null +++ b/UPDATING @@ -0,0 +1,8 @@ +rm -Rf src +git clone https://boringssl.googlesource.com/boringssl src +cd src +git show -s --pretty=%H > ../BORINGSSL_REVISION +cd .. +rm -Rf src/.git +rm -Rf linux-aarch64/ linux-arm/ linux-x86/ linux-x86_64/ mac-x86/ mac-x86_64/ win-x86_64/ win-x86/ +python src/util/generate_build_files.py android -- cgit v1.2.3 From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 00:26:37 +0000 Subject: Revert "external/boringssl: sync with upstream." This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25 --- UPDATING | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 UPDATING (limited to 'UPDATING') diff --git a/UPDATING b/UPDATING deleted file mode 100644 index 17af66d..0000000 --- a/UPDATING +++ /dev/null @@ -1,8 +0,0 @@ -rm -Rf src -git clone https://boringssl.googlesource.com/boringssl src -cd src -git show -s --pretty=%H > ../BORINGSSL_REVISION -cd .. -rm -Rf src/.git -rm -Rf linux-aarch64/ linux-arm/ linux-x86/ linux-x86_64/ mac-x86/ mac-x86_64/ win-x86_64/ win-x86/ -python src/util/generate_build_files.py android -- cgit v1.2.3 From b8494591d1b1a143f3b192d845c238bbf3bc629d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 02:29:14 +0000 Subject: Revert "Revert "external/boringssl: sync with upstream."" This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88 --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 UPDATING (limited to 'UPDATING') diff --git a/UPDATING b/UPDATING new file mode 100644 index 0000000..17af66d --- /dev/null +++ b/UPDATING @@ -0,0 +1,8 @@ +rm -Rf src +git clone https://boringssl.googlesource.com/boringssl src +cd src +git show -s --pretty=%H > ../BORINGSSL_REVISION +cd .. +rm -Rf src/.git +rm -Rf linux-aarch64/ linux-arm/ linux-x86/ linux-x86_64/ mac-x86/ mac-x86_64/ win-x86_64/ win-x86/ +python src/util/generate_build_files.py android -- cgit v1.2.3