Skip to content

Commit

Permalink
Make AndroidCompiledResourceMergingAction worker compatible
Browse files Browse the repository at this point in the history
Calling `System#exit` from within a worker compatible action will shut down unexpectedly.

Closes #14424.

PiperOrigin-RevId: 419761201
  • Loading branch information
Bencodes authored and copybara-github committed Jan 5, 2022
1 parent 9163539 commit 3df19e8
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,12 @@ public static void main(String[] args) throws Exception {
Files.copy(processedManifest, options.manifestOutput);
} catch (MergeConflictException e) {
logger.log(Level.SEVERE, e.getMessage());
System.exit(1);
throw e;
} catch (MergingException e) {
logger.log(Level.SEVERE, "Error during merging resources", e);
throw e;
} catch (AndroidManifestProcessor.ManifestProcessingException e) {
System.exit(1);
throw e;
} catch (Exception e) {
logger.log(Level.SEVERE, "Unexpected", e);
throw e;
Expand Down

0 comments on commit 3df19e8

Please sign in to comment.