Remove --blkid_path argument
deapexer doesn't need it. Bug: 279858383 Test: presubmit Change-Id: If0ec42b5edd4642f07c96ba641030c4dd6fb4660
This commit is contained in:
@@ -232,12 +232,10 @@ def PrepareApexDirectory(inp):
|
||||
|
||||
deapexer = 'deapexer'
|
||||
debugfs_path = 'debugfs'
|
||||
blkid_path = 'blkid'
|
||||
fsckerofs_path = 'fsck.erofs'
|
||||
if OPTIONS.search_path:
|
||||
debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')
|
||||
deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer')
|
||||
blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid_static')
|
||||
fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs')
|
||||
if os.path.isfile(deapexer_path):
|
||||
deapexer = deapexer_path
|
||||
@@ -263,7 +261,6 @@ def PrepareApexDirectory(inp):
|
||||
cmd = [deapexer,
|
||||
'--debugfs_path', debugfs_path,
|
||||
'--fsckerofs_path', fsckerofs_path,
|
||||
'--blkid_path', blkid_path,
|
||||
'extract',
|
||||
apex,
|
||||
os.path.join(outp, info['name'])]
|
||||
|
Reference in New Issue
Block a user