commit 8a3450da0ecaf3c0e494d33ff129b10a5df2ac73
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Mar 07 07:29:14 2019 +0000
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Mar 07 07:29:14 2019 +0000
tree 8b8f5176c445a10f2014788099eb8eba3c250794
parent 86f873396e3024bae68ab33ee123d261d5c06664

Revert "Temporarily disable assertion that checks for builder in run_on_as_app"

This reverts commit 86f873396e3024bae68ab33ee123d261d5c06664.

Reason for revert: Solved

Change-Id: I28b5d927da7a00b95aaab329a2928b49fbd22c49

tools/run_on_as_app.py

diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index aa7ed29..d95453f 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -511,9 +511,8 @@
     apk_dest = os.path.join(out_dir, unsigned_apk_name)
     as_utils.MoveFile(unsigned_apk, apk_dest, quiet=options.quiet)
 
-  # TODO(mkroghj) Re-enable this assertion when fix works in Golem.
-  # assert ('r8' not in shrinker
-  #     or CheckIsBuiltWithExpectedR8(apk_dest, temp_dir, shrinker, options))
+  assert ('r8' not in shrinker
+      or CheckIsBuiltWithExpectedR8(apk_dest, temp_dir, shrinker, options))
 
   profile_dest_dir = os.path.join(out_dir, 'profile')
   as_utils.MoveProfileReportTo(profile_dest_dir, stdout, quiet=options.quiet)