diff options
| author | David Benjamin <davidben@google.com> | 2016-08-11 13:26:41 -0400 |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2016-09-23 14:04:09 -0400 |
| commit | 7c0d06c221ce9edf44bbf978b909b38a0aee2084 (patch) | |
| tree | 493174506e099dc14252674dc832d9f11e58c4dc /src/third_party | |
| parent | 7b550be7e74118580614c6aa5c414d7245d2f189 (diff) | |
| download | boringssl-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 'src/third_party')
| -rw-r--r-- | src/third_party/android-cmake/METADATA | 15 | ||||
| -rw-r--r-- | src/third_party/android-cmake/README.google | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/third_party/android-cmake/METADATA b/src/third_party/android-cmake/METADATA new file mode 100644 index 00000000..0ba68174 --- /dev/null +++ b/src/third_party/android-cmake/METADATA @@ -0,0 +1,15 @@ +name: "android-cmake" +description: + "android-cmake is a collection of CMake scripts for building against the " + "Android NDK." + +third_party { + url { + type: HOMEPAGE + value: "https://github.com/taka-no-me/android-cmake/" + } + version: "556cc14296c226f753a3778d99d8b60778b7df4f" + last_upgrade_date { year: 2016 month: 6 day: 2 } + + local_modifications: "LICENSE file has been created for compliance purposes. Not included in original distribution." +} diff --git a/src/third_party/android-cmake/README.google b/src/third_party/android-cmake/README.google deleted file mode 100644 index b2a0caf6..00000000 --- a/src/third_party/android-cmake/README.google +++ /dev/null @@ -1,12 +0,0 @@ -URL: https://github.com/taka-no-me/android-cmake/archive/556cc14296c226f753a3778d99d8b60778b7df4f.zip -Version: 556cc14296c226f753a3778d99d8b60778b7df4f -License: BSD -License File: LICENSE - -Description: -android-cmake is a collection of CMake scripts for building against the Android -NDK. - -Local Modifications: -LICENSE file has been created for compliance purposes. Not included in original -distribution. |