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

Merge "Update extract items call in merge_dexopt." am: 6ae6a3aef6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2027303

Change-Id: Ic49c6d0fa636caba6e8b54f5d215ac01dfac8062
This commit is contained in:
Rob Seymour
2022-03-15 22:13:14 +00:00
committed by Automerger Merge Worker
parent 5dc3d4f43b 6ae6a3aef6
commit 5e9faa8c3d
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 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=('*',))