Snap for 10103804 from a499c017dcd2d9ad1a17b263a5e518bf137e3228 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: I7b9eb8d7abad12399e2b70458cd6535228a8b07a

2 files changed, 11 insertions, 1 deletions

diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index 8d18264..220e6a6 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -397,6 +397,8 @@ public class AndroidSdk {
                 builder.args(D8_COMMAND_NAME);
                 builder.args("-JXms16M").args("-JXmx1536M");
                 builder.args("-JXX:+TieredCompilation").args("-JXX:TieredStopAtLevel=1");
+                builder.args("-JDcom.android.tools.r8.emitRecordAnnotationsInDex");
+                builder.args("-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex");
                 builder.args("--thread-count").args("1");
 
                 // d8 will not allow compiling with a single dex file as the target, but if given
diff --git a/src/vogar/tasks/BuildActionTask.java b/src/vogar/tasks/BuildActionTask.java
index fd4c43a..04605fd 100644
--- a/src/vogar/tasks/BuildActionTask.java
+++ b/src/vogar/tasks/BuildActionTask.java
@@ -17,6 +17,7 @@
 package vogar.tasks;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -90,7 +91,14 @@ public final class BuildActionTask extends Task {
         if (run.debugging) {
             javac.debug();
         }
-        if (javaFile != null) {
+        if (javaFile == null) {
+            if (JAVA_SOURCE_PATTERN.matcher(action.getTargetClass()).find()) {
+                // This is likely a missing source file rather than a class
+                // named something.java....
+                throw new FileNotFoundException("Unlikely classname, assuming missing source file: "
+                    + action.getTargetClass());
+            }
+        } else {
             if (!JAVA_SOURCE_PATTERN.matcher(javaFile.toString()).find()) {
                 throw new CommandFailedException(Collections.<String>emptyList(),
                         Collections.singletonList("Cannot compile: " + javaFile));