Skip to content

Commit 64ffc09

Browse files
Bencodescopybara-github
authored andcommitted
Make AarGeneratorAction worker compatible
AarGeneratorAction isn't currently worker compatible even though the `ResourceProcessorBusyBox` action supports the `supports-workers` execution requirements. Closes #14144. PiperOrigin-RevId: 405477763
1 parent 10e5896 commit 64ffc09

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

‎src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public static final class AarGeneratorOptions extends OptionsBase {
159159
public boolean throwOnResourceConflict;
160160
}
161161

162-
public static void main(String[] args) {
162+
public static void main(String[] args) throws IOException {
163163
Stopwatch timer = Stopwatch.createStarted();
164164
OptionsParser optionsParser =
165165
OptionsParser.builder()
@@ -205,12 +205,11 @@ public static void main(String[] args) {
205205
String.format("Packaging finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
206206
} catch (MergeConflictException e) {
207207
logger.log(Level.SEVERE, e.getMessage());
208-
System.exit(1);
208+
throw e;
209209
} catch (IOException | MergingException e) {
210210
logger.log(Level.SEVERE, "Error during merging resources", e);
211-
System.exit(1);
211+
throw e;
212212
}
213-
System.exit(0);
214213
}
215214

216215
@VisibleForTesting

0 commit comments

Comments
 (0)