commit 863ab0839dc97b882c0a46770ef9f2e92b23dfaa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 02 16:11:02 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 02 16:11:02 2023 +0000
tree e119ef43db1b65b2afae9c88c088adaeaacdbf7e
parent 272407430c14a3966e4fe6ce1238b0848810125e
parent c14b6b9328b6675f7e4c1233075360a554286e6b

Merge "Snap for 9679998 from b917540b3d2706a8831d7656fbc602b5237df879 to sdk-release" into sdk-release

Android.bp

diff --git a/Android.bp b/Android.bp
index 541d37c..b5f1920 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@
     ],
     min_sdk_version: "14",
     srcs: ["ri/src/main/java/**/*.java"],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
 
 // Compatibility name

BUILD

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,
-)