Snap for 8570526 from 22907f4d05369353acca7789e0e4610a2d6ccacd to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release

Change-Id: Ic0fc2f7e267d6cfb3785a4afcab5869f85d346ca

3 files changed, 9 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index b233277..541d37c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,8 +48,8 @@ java_library_static {
     hostdex: true,
     sdk_version: "core_current",
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.media",
     ],
     min_sdk_version: "14",
     srcs: ["ri/src/main/java/**/*.java"],
diff --git a/BUILD b/BUILD
new file mode 100644
index 0000000..2d0449e
--- /dev/null
+++ b/BUILD
@@ -0,0 +1,7 @@
+# TODO(b/198224074): auto-generate this file using bp2build.
+
+java_library(
+    name = "jsr305",
+    srcs = glob(["ri/src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/OWNERS b/OWNERS
index f4abeee..10753f9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
-dauletz@google.com
 ngeoffray@google.com
+oth@google.com
 paulduffin@google.com