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

Merge "Searches for debugfs_static in search path"

Browse Source
This commit is contained in:
Treehugger Robot
2020-08-19 23:27:08 +00:00
committed by Gerrit Code Review
parent ec23cbb7d6 d6b799a627
commit 78439f4668
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/apex_utils.py
View File

@@ -61,7 +61,14 @@ class ApexApkSigner(object):
Returns: Returns:
The repacked apex file containing the signed apk files. The repacked apex file containing the signed apk files.
""" """
list_cmd = ['deapexer', 'list', self.apex_path] debugfs_path = os.path.join(OPTIONS.search_path, "bin", "debugfs_static")
if not os.path.exists(debugfs_path):
raise ApexSigningError(
"Couldn't find location of debugfs_static: " +
"Path {} does not exist. ".format(debugfs_path) +
"Make sure bin/debugfs_static can be found in -p <path>")
list_cmd = ['deapexer', '--debugfs_path',
debugfs_path, 'list', self.apex_path]
entries_names = common.RunAndCheckOutput(list_cmd).split() entries_names = common.RunAndCheckOutput(list_cmd).split()
apk_entries = [name for name in entries_names if name.endswith('.apk')] apk_entries = [name for name in entries_names if name.endswith('.apk')]
@@ -149,7 +156,8 @@ class ApexApkSigner(object):
# Add quote to the signing_args as we will pass # Add quote to the signing_args as we will pass
# --signing_args "--signing_helper_with_files=%path" to apexer # --signing_args "--signing_helper_with_files=%path" to apexer
if signing_args: if signing_args:
generate_image_cmd.extend(['--signing_args', '"{}"'.format(signing_args)]) generate_image_cmd.extend(
['--signing_args', '"{}"'.format(signing_args)])
# optional arguments for apex repacking # optional arguments for apex repacking
manifest_json = os.path.join(apex_dir, 'apex_manifest.json') manifest_json = os.path.join(apex_dir, 'apex_manifest.json')