commit 62e99632c61ef74fb04cf2bf6e079844e5dd8ae1
author Colin Cross <ccross@android.com> Thu Dec 03 01:10:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 03 01:10:47 2015 +0000
tree 372f45301de7bfed8a7d8774af5ddbb6b5987827
parent 2a23c0c85919bada137985f9e3b32514185b38c5
parent f87e97160646140fd5c5ad74da93610102ffd3b7

Merge "Provide path to mainDexClasses"

tools/releasetools/edify_generator.py

diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index b3785ac..d923cc8 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -284,8 +284,8 @@
     cmd = ['apply_patch("%s",\0"%s",\0%s,\0%d'
            % (srcfile, tgtfile, tgtsha1, tgtsize)]
     for i in range(0, len(patchpairs), 2):
-      cmd.append(',\0%s, package_extract_file("%s")' % patchpairs[i:i+2])
-    cmd.append(');')
+      cmd.append(',\0%s,\0package_extract_file("%s")' % patchpairs[i:i+2])
+    cmd.append(') ||\n    abort("Failed to apply patch to %s");' % (srcfile,))
     cmd = "".join(cmd)
     self.script.append(self.WordWrap(cmd))