Snap for 10453563 from 13df7e03341beb36b2038368930eb082a436c010 to mainline-art-release
Change-Id: I66d32d00902814ad7205e75476d69eb8bc3a670b
diff --git a/Android.bp b/Android.bp
index f1f34d7..91d16f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,7 @@
"guava",
],
apex_available: [
+ "//apex_available:platform",
"com.android.geotz",
],
}
diff --git a/tests/com/google/common/geometry/S2RegionCovererTest.java b/tests/com/google/common/geometry/S2RegionCovererTest.java
index 51e3de4..5ff8969 100644
--- a/tests/com/google/common/geometry/S2RegionCovererTest.java
+++ b/tests/com/google/common/geometry/S2RegionCovererTest.java
@@ -74,6 +74,9 @@
}
}
+ // b/280346791 - commented in Android as this test occasionally takes a long time, probably
+ // due to an upstream bug that generates pathological test geometry cases.
+ /*
public void testRandomCaps() {
logger.info("TestRandomCaps");
@@ -115,6 +118,7 @@
checkCovering(coverer, cap, denormalized, false);
}
}
+ */
public void testSimpleCoverings() {
logger.info("TestSimpleCoverings");