Snap for 10453563 from 72d01e3648e16613d4fa72478afa13b2b896b69a to mainline-conscrypt-release
Change-Id: I65e95f7a703e7d4a8bf4f8695f5b1c65c33bbe65
diff --git a/Android.bp b/Android.bp
index ba99b39..da07d37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,10 +38,17 @@
java_library {
name: "apache-commons-compress",
+ host_supported: true,
srcs: [
"src/main/java/**/*.java",
"src/stub/java/**/*.java",
],
- static_libs: ["xz-java","brotli-java"],
+ static_libs: [
+ "brotli-java",
+ "xz-java",
+ ],
+ java_version: "1.7", // Needed for Pack200, which is removed in newer versions
sdk_version: "current",
+ // TODO(b/237039251) use "apex_inherit" when Java modules support it
+ min_sdk_version: "29",
}