commit 3cd04a7abd797c3aa3d91ecf3ca916cedab4dac5
author Tao Bao <tbao@google.com> Tue Aug 06 20:10:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 06 20:10:44 2019 -0700
tree 7f0272ffb0e4c1a2ce19f0da48ee9def50aba640
parent 97aa75e1ea7a463902f896a5cf3e9be3dc7f637a
parent d08461c8619971b892c5469a997d76e1c814538e

Merge "releasetools: merge_target_files sets verbose in main." am: 3738f37e22 am: 7552bbdfb6
am: d08461c861

Change-Id: I2d0d961f258fb5a6149e1c25801121b7294a0f3d

tools/releasetools/merge_target_files.py

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 81b95c8..cfffbc7 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -94,7 +94,6 @@
 logger = logging.getLogger(__name__)
 
 OPTIONS = common.OPTIONS
-OPTIONS.verbose = True
 OPTIONS.framework_target_files = None
 OPTIONS.framework_item_list = None
 OPTIONS.framework_misc_info_keys = None
@@ -1057,6 +1056,9 @@
     common.Usage(__doc__)
     sys.exit(1)
 
+  # Always turn on verbose logging.
+  OPTIONS.verbose = True
+
   if OPTIONS.framework_item_list:
     framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list)
   else: