commit d43d46b92fa261e4d9de73ba75bb7fc41caf7fa3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 15 02:05:21 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 15 02:05:21 2022 +0000
tree 92571ea6afaeb88e3da4dbf9555004bef9b5d3fa
parent 5dd10d130e02b4d8c799640074123545e479a74f
parent 72d01e3648e16613d4fa72478afa13b2b896b69a

Snap for 9406101 from 72d01e3648e16613d4fa72478afa13b2b896b69a to udc-release

Change-Id: I33c79330c4fec7d618a3f210a1251ea47da476db

Android.bp

diff --git a/Android.bp b/Android.bp
index d1ee62d..da07d37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,11 +38,16 @@
 
 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",