commit 242ef7d3b748f17b862248ee158b114648c2f45c
author Pete Bentley <prb@google.com> Tue Jun 25 14:13:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 25 14:13:01 2019 +0000
tree c732b1ba9af5288ffadbe782059a9056eda5bfc5
parent 85d46c0057d0cd7c41bcf855b5e08d5e8d7800e1
parent e3cfb5d763fbdcd3226d7f4e2152a42336d4c4f9

Merge "CTS Fix: relax test for cipher suite selected during handshake."

Android.bp

diff --git a/Android.bp b/Android.bp
index 1a3a779..362d48a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -239,7 +239,7 @@
     target: {
         hostdex: {
             required: ["libjavacrypto"],
-        }
+        },
     },
 
     permitted_packages: [

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 4c8d137..84d310f 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,3 +1,4 @@
 [Builtin Hooks]
 commit_msg_test_field = true
 clang_format = true
+bpfmt = true

apex/testing/Android.bp

diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index da8b9e3..12c2756 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -18,5 +18,5 @@
     manifest: "test_apex_manifest.json",
     file_contexts: "com.android.conscrypt",
     // Test APEX, should never be installed
-    installable: false
+    installable: false,
 }