Use blkid_static rather than blkid for deapexer
deapexer is part of static_apex_tools target. Thus the binaries it
relies on needs to be static. However, blkid has shared lib dependency,
thus we have created blkid_static to replace blkid for deapexer.
BUG: b/257933023
TEST: local build of deapexer and static_apexer_tools
Change-Id: I5985a8dfe24c3c0f021ce44ae5f4565b36aa861c
Merged-In: I5985a8dfe24c3c0f021ce44ae5f4565b36aa861c
(cherry picked from commit e07b955eb4d7ea0c74a7f22b67ad367376aac36e)
diff --git a/tools/Android.bp b/tools/Android.bp
index c282738..fc35bfc 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -34,7 +34,7 @@
"apex_manifest",
],
required: [
- "blkid",
+ "blkid_static",
"debugfs_static",
"fsck.erofs",
],
diff --git a/tools/deapexer.py b/tools/deapexer.py
index f49ca69..83fb35c 100644
--- a/tools/deapexer.py
+++ b/tools/deapexer.py
@@ -344,7 +344,7 @@
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' % 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)
parser.add_argument('--blkid_path', help='The path to blkid binary', default=blkid_default)
