Rename debug to disable_assertions in toolhelper and callsites
Change-Id: Iffa181c0b09ab4cf989772b43e0bed257ec21cfd
diff --git a/tools/d8.py b/tools/d8.py
index cb6349d..b831849 100755
--- a/tools/d8.py
+++ b/tools/d8.py
@@ -45,7 +45,7 @@
return toolhelper.run('d8',
d8_args,
build=not options.no_build,
- debug=not options.disable_assertions,
+ disable_assertions=options.disable_assertions,
jar=utils.find_r8_jar_from_options(options),
main='com.android.tools.r8.D8',
time_consumer=time_consumer)
diff --git a/tools/disasm.py b/tools/disasm.py
index e341557..e050d9c 100755
--- a/tools/disasm.py
+++ b/tools/disasm.py
@@ -7,4 +7,4 @@
import toolhelper
if __name__ == '__main__':
- sys.exit(toolhelper.run('disasm', sys.argv[1:], debug=False))
+ sys.exit(toolhelper.run('disasm', sys.argv[1:], disable_assertions=True))
diff --git a/tools/minify_tool.py b/tools/minify_tool.py
index 2356ac1..c51f861 100755
--- a/tools/minify_tool.py
+++ b/tools/minify_tool.py
@@ -125,7 +125,7 @@
start_time = time.time()
return_code = toolhelper.run('r8',
args,
- debug=debug,
+ disable_assertions=not debug,
build=build,
track_memory_file=track_memory_file,
extra_args=java_args)
diff --git a/tools/r8.py b/tools/r8.py
index a2f54ce..a6bf42e 100755
--- a/tools/r8.py
+++ b/tools/r8.py
@@ -63,7 +63,7 @@
return toolhelper.run('r8',
r8_args,
build=not options.no_build,
- debug=not options.disable_assertions,
+ disable_assertions=options.disable_assertions,
debug_agent=options.debug_agent,
jar=utils.find_r8_jar_from_options(options),
main='com.android.tools.r8.R8',
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index ffe4298..f106022 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -523,7 +523,7 @@
exit_code = toolhelper.run(tool,
args,
build=should_build(options),
- debug=not options.disable_assertions,
+ disable_assertions=options.disable_assertions,
quiet=quiet,
jar=jar,
main=main)
@@ -743,7 +743,7 @@
tool,
args,
build=False,
- debug=not options.disable_assertions,
+ disable_assertions=options.disable_assertions,
profile=options.profile,
track_memory_file=options.track_memory_to_file,
extra_args=extra_args,
diff --git a/tools/toolhelper.py b/tools/toolhelper.py
index cfc386c..15fa557 100644
--- a/tools/toolhelper.py
+++ b/tools/toolhelper.py
@@ -15,7 +15,7 @@
def run(tool,
args,
build=None,
- debug=True,
+ disable_assertions=False,
profile=False,
track_memory_file=None,
extra_args=None,
@@ -51,7 +51,7 @@
cmd.append(
'-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
)
- if debug:
+ if not disable_assertions:
cmd.append('-ea')
if profile:
cmd.append('-agentlib:hprof=cpu=samples,interval=1,depth=8')
