From c4e2754380cc974e60d75e68ea20fad3dafd82cb Mon Sep 17 00:00:00 2001 From: Rob Seymour Date: Tue, 15 Mar 2022 17:43:51 +0000 Subject: [PATCH] Update extract items call in merge_dexopt. Test: merge builds with VSDK image Change-Id: I7788164ecbd69408d2293f49b98ab88db67e9cd9 --- tools/releasetools/merge/merge_dexopt.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/merge/merge_dexopt.py b/tools/releasetools/merge/merge_dexopt.py index dd6e2f906f..7bf9bd4b17 100644 --- a/tools/releasetools/merge/merge_dexopt.py +++ b/tools/releasetools/merge/merge_dexopt.py @@ -27,6 +27,7 @@ import shutil import subprocess import common +import merge_utils logger = logging.getLogger(__name__) OPTIONS = common.OPTIONS @@ -93,15 +94,15 @@ def MergeDexopt(temp_dir, output_target_files_dir): dexpreopt_vendor_config_files_temp_dir = os.path.join(temp_dir, 'vendor_config') - extract_items( + merge_utils.ExtractItems( input_zip=OPTIONS.framework_dexpreopt_tools, output_dir=dexpreopt_tools_files_temp_dir, extract_item_list=('*',)) - extract_items( + merge_utils.ExtractItems( input_zip=OPTIONS.framework_dexpreopt_config, output_dir=dexpreopt_framework_config_files_temp_dir, extract_item_list=('*',)) - extract_items( + merge_utils.ExtractItems( input_zip=OPTIONS.vendor_dexpreopt_config, output_dir=dexpreopt_vendor_config_files_temp_dir, extract_item_list=('*',))