Skip to content

Commit 3df19e8

Browse files
Bencodescopybara-github
authored andcommitted
Make AndroidCompiledResourceMergingAction worker compatible
Calling `System#exit` from within a worker compatible action will shut down unexpectedly. Closes #14424. PiperOrigin-RevId: 419761201
1 parent 9163539 commit 3df19e8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/tools/android/java/com/google/devtools/build/android/AndroidCompiledResourceMergingAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,12 @@ public static void main(String[] args) throws Exception {
259259
Files.copy(processedManifest, options.manifestOutput);
260260
} catch (MergeConflictException e) {
261261
logger.log(Level.SEVERE, e.getMessage());
262-
System.exit(1);
262+
throw e;
263263
} catch (MergingException e) {
264264
logger.log(Level.SEVERE, "Error during merging resources", e);
265265
throw e;
266266
} catch (AndroidManifestProcessor.ManifestProcessingException e) {
267-
System.exit(1);
267+
throw e;
268268
} catch (Exception e) {
269269
logger.log(Level.SEVERE, "Unexpected", e);
270270
throw e;

0 commit comments

Comments
 (0)