commit 5b9db62c93d779f975c96da7b1af1d9c1161ccde
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 01 14:01:49 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 01 14:01:49 2023 +0000
tree 92571ea6afaeb88e3da4dbf9555004bef9b5d3fa
parent 67a9cb06d6901ac0324d14e70a941482a2c1d838
parent 72d01e3648e16613d4fa72478afa13b2b896b69a

Snap for 9550733 from 72d01e3648e16613d4fa72478afa13b2b896b69a to mainline-tzdata5-release

Change-Id: I4a4dda425a51e7ea9e5a43d447ca5e2494f5fbcc

Android.bp

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",
 }