diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-20 16:10:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-20 16:10:40 +0000 |
commit | 4400d014cc0f6512bb3876cb42592f565a781fbe (patch) | |
tree | bf1239f221f4c8aab5d33153d9dcff6f142ba90f | |
parent | 4337fb3a8f0519afe5bdccac6767d77fc9f074c8 (diff) | |
parent | dea851f1ecb4e8e416bbbf78e072e32f48fabf19 (diff) | |
download | vogar-4400d014cc0f6512bb3876cb42592f565a781fbe.tar.gz |
Snap for 9979206 from dea851f1ecb4e8e416bbbf78e072e32f48fabf19 to sdk-releaseplatform-tools-34.0.3
Change-Id: I5e860e4074ee48683f793e411a071cff54629192
-rw-r--r-- | src/vogar/android/AndroidSdk.java | 2 | ||||
-rw-r--r-- | src/vogar/tasks/BuildActionTask.java | 10 |
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)); |