Make --blkid_path argument optional
This has been a no-op argument. In this change, it becomes optional.
This is a preparation step for removing the argument. There'll be more
follow-up changes removing argument passing.
Bug: 279858383
Test: atest apex_compression_test (which uses deapexer)
(cherry picked from https://android-review.googlesource.com/q/commit:ca73282b4b984755c88371d4d35571f1ed463df5)
Merged-In: Ie09963c52a1b55d82f4e3565de10192364d29380
Change-Id: Ie09963c52a1b55d82f4e3565de10192364d29380
diff --git a/tools/deapexer.py b/tools/deapexer.py
index f71f495..33e5582 100755
--- a/tools/deapexer.py
+++ b/tools/deapexer.py
@@ -390,15 +390,13 @@
debugfs_default = None
fsckerofs_default = None
- blkid_default = None
if 'ANDROID_HOST_OUT' in os.environ:
debugfs_default = '%s/bin/debugfs_static' % os.environ['ANDROID_HOST_OUT']
fsckerofs_default = '%s/bin/fsck.erofs' % os.environ['ANDROID_HOST_OUT']
- blkid_default = '%s/bin/blkid_static' % os.environ['ANDROID_HOST_OUT']
parser.add_argument('--debugfs_path', help='The path to debugfs binary', default=debugfs_default)
parser.add_argument('--fsckerofs_path', help='The path to fsck.erofs binary', default=fsckerofs_default)
# TODO(b/279858383) remove the argument
- parser.add_argument('--blkid_path', help='NOT USED', default=blkid_default)
+ parser.add_argument('--blkid_path', help='NOT USED')
subparsers = parser.add_subparsers(required=True, dest='cmd')
@@ -445,11 +443,6 @@
sys.exit(1)
if args.cmd == 'extract':
- if not args.blkid_path:
- print('ANDROID_HOST_OUT environment variable is not defined, --blkid_path must be set',
- file=sys.stderr)
- sys.exit(1)
-
if not args.fsckerofs_path:
print('ANDROID_HOST_OUT environment variable is not defined, --fsckerofs_path must be set',
file=sys.stderr)
