From a05e6ccdba85f5e827245aa581accd2867e40851 Mon Sep 17 00:00:00 2001
From: Tobias Werth <twerth@google.com>
Date: Tue, 14 Aug 2018 07:16:52 -0700
Subject: Explicitly cast ByteBuffer in clear() call to Buffer.

This works around the following error:
java.lang.NoSuchMethodError: java.nio.ByteBuffer.clear()Ljava/nio/ByteBuffer;
	at com.google.devtools.build.lib.profiler.Profiler$BinaryFormatWriter.run(Profiler.java:949)
	at java.lang.Thread.run(Thread.java:748)

JDK 9 introduced an overloaded methods with covariant return type.

Closes #5886.

PiperOrigin-RevId: 208642556
---
 .bazelci/postsubmit.yml | 11 +++++++++++
 .bazelci/presubmit.yml  | 11 +++++++++++
 2 files changed, 22 insertions(+)

(limited to '.bazelci')

diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 9286983cac..c3816bd9dc 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -15,6 +15,8 @@ platforms:
     - "//src/test/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -30,6 +32,8 @@ platforms:
     - "//src/test/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   ubuntu1804:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -45,6 +49,8 @@ platforms:
     - "//src/test/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   macos:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -60,6 +66,8 @@ platforms:
     - "//src/test/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   windows:
     build_flags:
     - "--copt=-w"
@@ -73,7 +81,10 @@ platforms:
     - "--test_env=JAVA_HOME"
     - "--test_timeout=1200"
     test_targets:
+    - "--"
     - "//src:all_windows_tests"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   rbe_ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 84f4f0d500..d1bc3f1c14 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -19,6 +19,8 @@ platforms:
     - "-//src/test/shell/bazel:bazel_determinism_test"
     # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
     - "-//src/test/shell/bazel/android:android_ndk_integration_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -38,6 +40,8 @@ platforms:
     - "-//src/test/shell/bazel:bazel_determinism_test"
     # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
     - "-//src/test/shell/bazel/android:android_ndk_integration_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   ubuntu1804:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -57,6 +61,8 @@ platforms:
     - "-//src/test/shell/bazel:bazel_determinism_test"
     # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
     - "-//src/test/shell/bazel/android:android_ndk_integration_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   macos:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -87,6 +93,8 @@ platforms:
     - "-//src/test/shell/bazel:git_repository_test"
     - "-//src/test/shell/bazel/android:aar_integration_test"
     - "-//src/test/shell/bazel/android:android_integration_test"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   windows:
     build_flags:
     - "--copt=-w"
@@ -100,7 +108,10 @@ platforms:
     - "--test_env=JAVA_HOME"
     - "--test_timeout=1200"
     test_targets:
+    - "--"
     - "//src:all_windows_tests"
+    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/5888
+    - "-//src/test/java/com/google/devtools/build/android/ziputils:ziputils-tests"
   rbe_ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
-- 
cgit v1.2.3