From 11dd7c9a16f63238b4b633394ce0d9c63d5f48ca Mon Sep 17 00:00:00 2001
From: Miguel Aranda <miguelaranda@google.com>
Date: Thu, 2 Jul 2026 13:29:04 +0000
Subject: [PATCH] Project import generated by Copybara.

PiperOrigin-RevId: 941668766
---
 README.md                            | 4 ++--
 android/build.gradle                 | 2 +-
 fix_format.py                        | 2 +-
 skills/conscrypt_formatting/SKILL.md | 4 ++--
 testing/build.gradle                 | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 fix_format.py

diff --git a/README.md b/README.md
index 6f1d5575a..272bab3b4 100644
--- a/README.md
+++ b/README.md
@@ -109,8 +109,8 @@ similar performance.
 
 Download
 -------------
-Conscrypt supports **Java 8** or later on OpenJDK and **KitKat (API Level
-19)** or later on Android.  The build artifacts are available on Maven Central.
+Conscrypt supports **Java 8** or later on OpenJDK and **Lollipop (API Level
+21)** or later on Android.  The build artifacts are available on Maven Central.
 
 ### Download JARs
 You can download
diff --git a/android/build.gradle b/android/build.gradle
index e20c72be0..e8413a2b0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -12,7 +12,7 @@ ext {
     androidSdkInstalled = file("$androidHome").exists()
     androidVersionCode = 1
     androidVersionName = "$version"
-    androidMinSdkVersion = 19
+    androidMinSdkVersion = 21
     androidTargetSdkVersion = 26
     androidNdkVersion = '27.3.13750724'
     androidCmakeVersion = '3.22.1'
diff --git a/fix_format.py b/fix_format.py
old mode 100755
new mode 100644
index 065dad46e..905de6e60
--- a/fix_format.py
+++ b/fix_format.py
@@ -6,7 +6,7 @@
 from typing import List, FrozenSet
 
 CLANG_FORMAT_BIN: str = "clang-format"
-PROJECT_PREFIX: str = "//depot/google3/third_party/java_src/conscrypt/"
+PROJECT_PREFIX: str = "//depot/google3/third_party/java/conscrypt/main_src/"
 VALID_EXTENSIONS: FrozenSet[str] = frozenset({".java", ".cc", ".h", ".cpp", ".c"})
 
 def get_g4_output() -> str:
diff --git a/skills/conscrypt_formatting/SKILL.md b/skills/conscrypt_formatting/SKILL.md
index 8d47877aa..7190dd540 100644
--- a/skills/conscrypt_formatting/SKILL.md
+++ b/skills/conscrypt_formatting/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: conscrypt-formatting
 description: >-
-  Automatically formats C++, Java, and C source files in the Conscrypt directory using a project-specific formatting tool. Use when you have modified any C++, Java, or C files under `third_party/java_src/conscrypt/` and need to ensure they comply with project style before committing or submitting. Don't use for general Google3 formatting (use the standard `g4 fix` or `hg fix` instead unless working in Conscrypt).
+  Automatically formats C++, Java, and C source files in the Conscrypt directory using a project-specific formatting tool. Use when you have modified any C++, Java, or C files under `third_party/java/conscrypt/main_src/` and need to ensure they comply with project style before committing or submitting. Don't use for general Google3 formatting (use the standard `g4 fix` or `hg fix` instead unless working in Conscrypt).
 ---
 
 # Conscrypt Formatting
@@ -25,5 +25,5 @@ formatters are not sufficient as Conscrypt uses a specific configuration.
 Run the Python script located in the Conscrypt root directory:
 
 ```bash
-python3 third_party/java_src/conscrypt/fix_format.py
+python3 third_party/java/conscrypt/main_src/fix_format.py
 ```
diff --git a/testing/build.gradle b/testing/build.gradle
index eefd65072..dda77e406 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -17,9 +17,9 @@ sourceSets {
 dependencies {
     compileOnly project(':conscrypt-constants')
 
-    implementation libs.bouncycastle.apis
-    implementation libs.bouncycastle.provider
-    api libs.junit
+    implementation libs.bouncycastle.apis,
+            libs.bouncycastle.provider,
+            libs.junit
 }
 
 // No public methods here.