Use newly added diagnostic types in API tests.
Change-Id: Ie423c60424691fc31c352f79d0754134f4a52c6b
diff --git a/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java b/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java
index 0bd1277..d523a53 100644
--- a/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java
+++ b/src/test/apiUsageSample/com/android/tools/apiusagesample/D8DiagnosticsHandler.java
@@ -6,6 +6,7 @@
import com.android.tools.r8.Diagnostic;
import com.android.tools.r8.DiagnosticsHandler;
+import com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic;
import com.android.tools.r8.origin.ArchiveEntryOrigin;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.origin.PathOrigin;
@@ -35,7 +36,11 @@
@Override
public void warning(Diagnostic warning) {
- convertToMessage(warning);
+ if (warning instanceof InterfaceDesugarMissingTypeDiagnostic) {
+ desugarInterfaceMethodInfo((InterfaceDesugarMissingTypeDiagnostic) warning);
+ } else {
+ convertToMessage(warning);
+ }
}
@Override
@@ -43,6 +48,12 @@
convertToMessage(info);
}
+ void desugarInterfaceMethodInfo(InterfaceDesugarMissingTypeDiagnostic info) {
+ System.out.println("desugar is missing: " + info.getMissingType().toString());
+ System.out.println(" used from: " + info.getContextType().toString());
+ convertToMessage(info);
+ }
+
protected void convertToMessage(Diagnostic diagnostic) {
String textMessage = diagnostic.getDiagnosticMessage();
diff --git a/tests/d8_api_usage_sample.jar b/tests/d8_api_usage_sample.jar
index 9b7e3f5..066d9d0 100644
--- a/tests/d8_api_usage_sample.jar
+++ b/tests/d8_api_usage_sample.jar
Binary files differ
diff --git a/tests/r8_api_usage_sample.jar b/tests/r8_api_usage_sample.jar
index aa8aac2..066d9d0 100644
--- a/tests/r8_api_usage_sample.jar
+++ b/tests/r8_api_usage_sample.jar
Binary files differ
