Exclude crash tests for O
BUG=714672
Review-Url: https://codereview.chromium.org/2846703004
Cr-Commit-Position: refs/heads/master@{#468253}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index f3b72f5..48f5d39 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -413,6 +413,15 @@
# From java_sources.gni.
java_files = chrome_test_java_sources
+ # TODO(crbug/716236): Remove this exclusion and update these two test files,
+ # after the O SDK is rolled.
+ if (android_sdk_version == "O") {
+ java_files -= [
+ "javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java",
+ "javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java",
+ ]
+ }
+
deps = [
"//base:base_java",
"//base:base_java_test_support",
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java
index e4595add..9b56f36 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java
@@ -49,6 +49,7 @@
}
};
+ // TODO(crbug/716236): Refer to this crbug for compilation error after the O SDK is rolled.
@TargetApi(Build.VERSION_CODES.M)
private static class TestJobScheduler extends JobScheduler {
TestJobScheduler() {}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
index a0b6167..72274ca 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
@@ -571,6 +571,7 @@
}
}
+ // TODO(crbug/716236): Refer to this crbug for compilation error after the O SDK is rolled.
/**
* A JobScheduler wrapper that verifies that the expected properties are set correctly.
*/
