Snap for 10103804 from d125970ae65b97759aca271f65bb9ce786074c34 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Ie57ba90aedb917cd7807393b99bb5e1e35b0fa99

2 files changed, 3 insertions, 68 deletions

diff --git a/BUILD b/BUILD
deleted file mode 100644
index c2857de7d..000000000
--- a/BUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# TODO(b/198224074): auto-generate this file using bp2build.
-#
-
-alias(
-    name = "guava",
-    actual = select({
-        "//build/bazel/platforms/os:android": ":guava-android-host",
-        "//conditions:default": ":guava-jre",
-    }),
-    visibility = ["//visibility:public"],
-)
-
-java_library(
-    name = "guava-android-host",
-    srcs = glob(["android/guava/src/**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        ":guava-android-annotation-stubs",
-        ":guava-both",
-        "//external/error_prone:error_prone_annotations",
-    ],
-    exports = [
-        ":guava-both",
-    ],
-    target_compatible_with = ["//build/bazel/platforms/os:android"],
-)
-
-java_library(
-    name = "guava-android-annotation-stubs",
-    srcs = glob(["android-annotation-stubs/src/**/*.java"]),
-)
-
-java_library(
-    name = "guava-both",
-    srcs = glob(["futures/failureaccess/**/*.java"]),
-    deps = [
-        ":guava-android-annotation-stubs",
-        "//external/error_prone:error_prone_annotations",
-        "//external/jsr305",
-    ],
-    exports = [
-        "//external/jsr305",
-    ],
-)
-
-java_library(
-    name = "guava-jre",
-    srcs = glob(["guava/src/**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        ":guava-android-annotation-stubs",
-        ":guava-both",
-        "//external/error_prone:error_prone_annotations",
-    ],
-    exports = [
-        ":guava-both",
-    ],
-)
-
-java_library(
-    name = "guava-neverlink",
-    exports = [":guava"],
-    neverlink = True,
-)
-
diff --git a/METADATA b/METADATA
index 9bf3de19d..5b12c4896 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@ third_party {
     type: GIT
     value: "https://github.com/google/guava.git"
   }
-  version: "31.0.1"
+  version: "31.1"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2021
-    month: 12
+    year: 2022
+    month: 6
     day: 7
   }
 }