Snap for 10453563 from c3252a88f5b8b16900aec1fb222245aceb68a47b to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: I3341efdab8a198b22ac8aef50f007b907dedbadc

1 files changed, 20 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 03b4914..e010bf1 100755
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@ cc_library_static {
     ramdisk_available: true,
     vendor_ramdisk_available: true,
 
+    min_sdk_version: "apex_inherit",
     apex_available: [
         "//apex_available:platform",
         "com.android.adbd",
@@ -102,6 +103,21 @@ cc_binary {
     static_libs: ["libbrotli"],
 }
 
+cc_library_shared {
+    name: "libbrotli_encoder_jni",
+    host_supported: true,
+    srcs: [
+        "java/org/brotli/wrapper/enc/encoder_jni.cc",
+    ],
+    static_libs: [
+      "libnativehelper_lazy",
+      "libbrotli",
+    ],
+    cflags: [
+        "-Wno-unused-parameter",
+    ],
+}
+
 //
 // Support for brotli in java code.
 //
@@ -113,6 +129,10 @@ java_library {
     srcs: ["java/**/*.java"],
     exclude_srcs: ["java/**/*Test.java"],
     sdk_version: "current",
+    // TODO(b/237039251) use "apex_inherit" when Java modules support it
+    min_sdk_version: "29",
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
 
 // TODO(b/171429704): Remove this genrule and use the fuzz_data.zip