Merge changes from topic "presubmit-am-c54e2eff303d4593a6ebf99d28c702a7" into tm-dev

* changes:
  [automerge] Move stubs to the bottom of Android.bp 2p: 387b06d843
  Move stubs to the bottom of Android.bp

1 files changed, 16 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 391ac12a..99cb537b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -125,21 +125,6 @@ java_library {
     notice: "LICENSE",
 }
 
-// Compile dummy implementations of annotations used by exoplayer but not
-// present in the Android tree.
-java_library {
-    name: "exoplayer2-annotation-stubs",
-    host_supported: true,
-    sdk_version: "core_current",
-    apex_available: [
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "16",
-    srcs: ["annotation-stubs/src/**/*.java"],
-    static_libs: ["jsr305"],
-    visibility: ["//visibility:private"],
-}
-
 // Exposes util classes for testing MediaParser.
 android_library {
     name: "exoplayer2-extractor-test-utils",
@@ -198,3 +183,19 @@ android_library {
         "-0 .webm",
     ],
 }
+
+// Compile dummy implementations of annotations used by exoplayer but not
+// present in the Android tree.
+java_library {
+    name: "exoplayer2-annotation-stubs",
+    host_supported: true,
+    sdk_version: "core_current",
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
+    min_sdk_version: "16",
+    srcs: ["annotation-stubs/src/**/*.java"],
+    static_libs: ["jsr305"],
+    visibility: ["//visibility:private"],
+}