Snap for 9710098 from 820c6121152a434d4b7b588df4fec1eeda4afd60 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Icda8c205d89a8f3545cd56bfb6542bce31a3a7d6

2 files changed, 2 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index 541d37c..b5f1920 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@ java_library_static {
     ],
     min_sdk_version: "14",
     srcs: ["ri/src/main/java/**/*.java"],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
 
 // Compatibility name
diff --git a/BUILD b/BUILD
deleted file mode 100644
index 123b07c..0000000
--- a/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-# TODO(b/198224074): auto-generate this file using bp2build.
-
-java_library(
-    name = "jsr305",
-    srcs = glob(["ri/src/main/java/**/*.java"]),
-    visibility = ["//visibility:public"],
-)
-
-java_library(
-    name = "jsr305-neverlink",
-    exports = [":jsr305"],
-    neverlink = True,
-)