Do not report -checkdiscard errors in Chrome test
Bug: b/288184354
Change-Id: I4ae09f6628f9ca6745b6a06a081ef7ffe914a96c
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 7841a75..d8ef734 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2226,7 +2226,6 @@
*/
public boolean addCallEdgesForLibraryInvokes = false;
- public boolean allowCheckDiscardedErrors = false;
public boolean allowClassInliningOfSynthetics = true;
public boolean allowInjectedAnnotationMethods = false;
public boolean allowInliningOfSynthetics = true;
@@ -2264,7 +2263,8 @@
public BiConsumer<IRCode, AppView<?>> irModifier = null;
public Consumer<IRCode> inlineeIrModifier = null;
public int basicBlockMuncherIterationLimit = NO_LIMIT;
- public boolean dontReportFailingCheckDiscarded = false;
+ public boolean dontReportFailingCheckDiscarded =
+ System.getProperty("com.android.tools.r8.testing.dontReportFailingCheckDiscarded") != null;
public boolean disableRecordApplicationReaderMap = false;
public boolean trackDesugaredAPIConversions =
System.getProperty("com.android.tools.r8.trackDesugaredAPIConversions") != null;
diff --git a/tools/chrome_data.py b/tools/chrome_data.py
index ebae542..69d3a28 100644
--- a/tools/chrome_data.py
+++ b/tools/chrome_data.py
@@ -256,7 +256,8 @@
'inputs': [os.path.join(V200430_BASE, 'program.jar')],
'pgconf': [os.path.join(V200430_BASE, 'proguard.config')],
'libraries': [os.path.join(V200430_BASE, 'library.jar')],
- 'min-api': ANDROID_N_API
+ 'min-api': ANDROID_N_API,
+ 'system-properties': ['-Dcom.android.tools.r8.testing.dontReportFailingCheckDiscarded=1'],
},
},
'200520-monochrome_public_minimal_apks': {
