Merge branch 'master' into 02_native_build

Author: prbprbprb

build-logic/src/main/groovy/conventions.boringssl.gradle

@@ -4,15 +4,17 @@ plugins {
 
 def boringHome = (project.findProperty('boringsslHome') ?: System.getenv('BORINGSSL_HOME'))
 if (!boringHome) {
-    throw new GradleException("boringsslHome not set. Provide -PboringsslHome or BORINGSSL_HOME.")
+    throw new GradleException("boringsslHome not set. Provide -PboringsslHome or \$BORINGSSL_HOME.")
 }
 
 def boringInclude = file("${boringHome}/include").absolutePath
 if (!file(boringInclude).exists()) {
     throw new GradleException("BoringSSL include dir not found: ${boringInclude}")
 }
 
-// Export only the properties expected by downstream logic
-ext.boringsslHome       = boringHome
-ext.boringsslIncludeDir = boringInclude
-ext.boringSslVersion    = org.ajoberstar.grgit.Grgit.open(dir: boringHome).head().id
+ext {
+    boringsslHome       = boringHome
+    boringsslIncludeDir = boringInclude
+    boringSslVersion    = org.ajoberstar.grgit.Grgit.open(dir: boringHome).head().id
+}
+

openjdk-uber/build.gradle

@@ -1,8 +1,15 @@
 plugins {
     id 'conventions.common'
+    id 'conventions.boringssl'
     id 'conventions.jvm'
 }
 
+repositories {
+    mavenCentral()
+    // TODO(prb): Gate this on a property to ensure that local testing can't contaminate releases.
+    mavenLocal()
+}
+
 description = 'Conscrypt: OpenJdk UberJAR'
 
 Directory buildTop = layout.buildDirectory.get()