aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-08-14 15:37:43 -0700
committerXin Li <delphij@google.com>2023-08-14 15:37:43 -0700
commit8b7239277f6ae4094ae1fc21cbab1361c54ca05e (patch)
tree3426225174f100d5c639e799f69bea9f342dc8e4
parent5981b688be4d0524b86bf82d6e0ed68fc5f496cc (diff)
parent3972655f5ee9ca48c6e65c51ab285d4b8dec9a7c (diff)
downloadguava-8b7239277f6ae4094ae1fc21cbab1361c54ca05e.tar.gz
Merge Android U (ab/10368041)
Bug: 291102124 Merged-In: Ie7e462986411cb5760b83483eeffb123a19b1631 Change-Id: If664395401d55282838eb3bdb300d2d798cd327b
-rw-r--r--Android.bp7
1 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index d4944233f..6a861aa81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -159,13 +159,20 @@ java_host_for_device {
// 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