StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update extract items call in merge_dexopt.

Browse Source 
Test: merge builds with VSDK image
Change-Id: I7788164ecbd69408d2293f49b98ab88db67e9cd9
This commit is contained in:
Rob Seymour
2022-03-15 17:43:51 +00:00
parent 1b8a1490a9
commit c4e2754380
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/merge/merge_dexopt.py
View File

@@ -27,6 +27,7 @@ import shutil
import subprocess import subprocess
import common import common
import merge_utils
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
OPTIONS = common.OPTIONS 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, dexpreopt_vendor_config_files_temp_dir = os.path.join(temp_dir,
'vendor_config') 'vendor_config')
extract_items( merge_utils.ExtractItems(
input_zip=OPTIONS.framework_dexpreopt_tools, input_zip=OPTIONS.framework_dexpreopt_tools,
output_dir=dexpreopt_tools_files_temp_dir, output_dir=dexpreopt_tools_files_temp_dir,
extract_item_list=('*',)) extract_item_list=('*',))
extract_items( merge_utils.ExtractItems(
input_zip=OPTIONS.framework_dexpreopt_config, input_zip=OPTIONS.framework_dexpreopt_config,
output_dir=dexpreopt_framework_config_files_temp_dir, output_dir=dexpreopt_framework_config_files_temp_dir,
extract_item_list=('*',)) extract_item_list=('*',))
extract_items( merge_utils.ExtractItems(
input_zip=OPTIONS.vendor_dexpreopt_config, input_zip=OPTIONS.vendor_dexpreopt_config,
output_dir=dexpreopt_vendor_config_files_temp_dir, output_dir=dexpreopt_vendor_config_files_temp_dir,
extract_item_list=('*',)) extract_item_list=('*',))