GitLab

* commit 'bf877901':
  Switch from core to core-libart

* commit 'ecd29abc':
  Switch from core to core-libart

Bug: 14298175
Change-Id: I5035075f2453b692f86fff8fe852c954698e40ed

* commit 'ff3c2044':
  Use the new version of TLS Channel ID extension.

* commit '69c36470':
  Use the new version of TLS Channel ID extension.

Bug: 14083889
Change-Id: I5fe0a1558184d44eb8a24bd92c0e7517937f3a5c

* commit 'dea78c6f':
  Add support for a Google Play Services version of the JNI lib

* commit 'b4510b0f':
  Make TLS Channel ID tests use ECDHE_RSA key exchange.

* commit '90c92a2b':
  Add support for a Google Play Services version of the JNI lib

* commit 'ea7cf2a1':
  Make TLS Channel ID tests use ECDHE_RSA key exchange.

TLS Channel ID requires ECDHE-based key exchange.

Change-Id: I722135c96a3ce700dcdf1646d2a71654923bb85c

* commit '23d99f15':
  Fix 64-bit build error.

* commit 'fb07b3ce':
  Add ability to wrap platform keys

* commit 'e553da19':
  Build conscrypt_unbundled using Gradle

* commit '3a698c26':
  Move FileClientSessionCache to main directory

* commit '1b60d4ff':
  Fix 64-bit build error.

Change-Id: I7ff48af2991fc03811c7874a974b9052934d27ae

* commit 'c7019557':
  Remove deprecated WITH_HOST_DALVIK.

* commit 'f24ba062':
  Add ability to wrap platform keys

This is mostly useful for unbundled Conscrypt currently when working
with KeyChain-based keys, but could be good for use with PKCS11-like
keys in other JSSE providers.

Bug: 15469749
Change-Id: I56bf2eaf3228bdf42d671437f4fffdafb8b47b12

* commit 'ba94b3df':
  Build conscrypt_unbundled using Gradle

* commit '47e40a5c':
  Move FileClientSessionCache to main directory

Change-Id: I96ae5539b6195ccbeb92af1beb7e78660ef757a1

Change-Id: I282c701b191d68bc4dcfa390505968f97a5c7d3c

Change-Id: Ie0d9f83e366c0b99994eb861ae567d454cbbea5b

* commit 'cc58989f':
  Remove deprecated WITH_HOST_DALVIK.

* commit 'c5a998dd':
  Add more debugging for getting methods

* commit 'fee2d0f1':
  Add more debugging for getting methods

When JNI registration fails, we should log it immediately to help
with debugging. Otherwise, it will tell you that you called a JNI
function with an exception pending.

Change-Id: I7cbba4d6639265a79a9d043d120f1a2bf72a85f7

Switch host build to clang as conscrypt uses C++11 and not all GCC
host compilers support it.

Bug: 13751317
Change-Id: I74ffdda695e47967b61a133c8b6fc52f6547a3a0

* commit '3483e223':
  Make default user CA storage location configurable

* commit 'ff12765d':
  Make default user CA storage location configurable

am f69e50e6: merge in master-release history after reset to c4f9d7a5

* commit 'f69e50e6':
  SSL: also allow calls to read/write after cutthrough
  am 2a9ca52c: Call SSL_set_alpn_protos with right native pointer

Allows overriding the defaults in misc/keychain/ with different
defaults, for example when the whole process uses another directory
and this needs to be reflected in every new TrustedCertificateStore
that is created.

Change-Id: I22db18178600668053a17517e9b47eef7b9be5ed

* commit '77c5767b':
  Move platform-only files out to separate directory

* commit 'f92e61e2':
  Move platform-only files out to separate directory

To aid in building Conscrypt with gradle, move the platform-only files
out to a separate directory.

Change-Id: I8f07959055261f6b9f2a0ac26dea2f6431d9edbe