commit 1a8755de85e6400a3432aa34d9b62386047bff47
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 15 23:17:57 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 15 23:17:57 2023 +0000
tree e119ef43db1b65b2afae9c88c088adaeaacdbf7e
parent 1b00bff27567a1d93da8622454748514449a3246
parent 820c6121152a434d4b7b588df4fec1eeda4afd60

Snap for 9611449 from 820c6121152a434d4b7b588df4fec1eeda4afd60 to mainline-rkpd-release

Change-Id: I0f53f743394cbb9c4b0488663d310dd77ea45404

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