From cb84817fdfb57fa91c946c45c4bfb236c0bd56cb Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Fri, 3 Apr 2020 12:50:47 -0700 Subject: [PATCH] Ensure that merge_target_files.py prints INFO level logs. Bug: 153166596 Test: Run a merge build, inspect logs. Change-Id: Ic2795f26922db32030c7ab7eb4ec6f153c1e9654 --- tools/releasetools/merge_target_files.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index dd7806bde0..d9d3854056 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -95,6 +95,8 @@ import ota_from_target_files logger = logging.getLogger(__name__) OPTIONS = common.OPTIONS +# Always turn on verbose logging. +OPTIONS.verbose = True OPTIONS.framework_target_files = None OPTIONS.framework_item_list = None OPTIONS.framework_misc_info_keys = None @@ -1109,9 +1111,6 @@ def main(): 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: