Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae6a3ae authored by Rob Seymour's avatar Rob Seymour Committed by Gerrit Code Review
Browse files

Merge "Update extract items call in merge_dexopt."

parents 423e117f c4e27543

tools/releasetools/merge/merge_dexopt.py

+4 −3
Original line number Diff line number Diff line
@@ -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=('*',))