Merge "Update external/guava METADATA to match r.android.com/2063347" am: 9f788d5119 am: 5981b688be am: 79ace77003
Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2550752
Change-Id: Ie7e462986411cb5760b83483eeffb123a19b1631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index d494423..6a861aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -159,13 +159,20 @@
// Compile dummy implementations of annotations used by guava but not
// present in the Android tree.
+// 30 may not be the lowest min_sdk_version, but the min sdk version
+// for permission controller.
java_library {
name: "guava-android-annotation-stubs",
host_supported: true,
// b/267831518: Pin tradefed and dependencies to Java 11.
java_version: "11",
sdk_version: "core_current",
+ min_sdk_version: "30",
srcs: ["android-annotation-stubs/src/**/*.java"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
}
// Compile guava testlib
