Replace blkid with blkid_static
BUG: b/257933023
Change-Id: I66078f86bd7b7c3a929543520a65dba4a4f0b2cc
Merged-In: I66078f86bd7b7c3a929543520a65dba4a4f0b2cc
(cherry picked from commit 32bc4ce81c44b56e45dd0e9e96f7a5a51e4db97b)
diff --git a/Android.mk b/Android.mk
index 62cd57b..73292aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -625,7 +625,7 @@
rm -rf $$apex_dir && \
mkdir -p $$apex_dir && \
debugfs=$(HOST_OUT)/bin/debugfs_static && \
- blkid=$(HOST_OUT)/bin/blkid && \
+ blkid=$(HOST_OUT)/bin/blkid_static && \
fsckerofs=$(HOST_OUT)/bin/fsck.erofs && \
$(HOST_OUT)/bin/deapexer --debugfs_path $$debugfs --blkid_path $$blkid \
--fsckerofs_path $$fsckerofs extract $$apex_file $$apex_dir; \
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 19d0cd8..898c4b0 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -506,7 +506,7 @@
" --deapexer $(location deapexer)" +
" --debugfs $(location debugfs_static)" +
" --fsckerofs $(location fsck.erofs)" +
- " --blkid $(location blkid)" +
+ " --blkid $(location blkid_static)" +
" --tmpdir $(genDir)"
// The non-flattened APEXes are always checked, as they are always generated
@@ -516,7 +516,7 @@
defaults: ["art_module_source_build_genrule_defaults"],
tools: [
"art-apex-tester",
- "blkid",
+ "blkid_static",
"deapexer",
"debugfs_static",
"fsck.erofs",
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index a963813..b7d5e24 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -1025,7 +1025,7 @@
test_args = test_parser.parse_args(['unused']) # For consistency.
test_args.debugfs = '%s/bin/debugfs' % host_out
test_args.fsckerofs = '%s/bin/fsck.erofs' % host_out
- test_args.blkid = '%s/bin/blkid' % host_out
+ test_args.blkid = '%s/bin/blkid_static' % host_out
test_args.tmpdir = '.'
test_args.tree = False
test_args.list = False
diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh
index 9e6167a..290f121 100755
--- a/build/apex/runtests.sh
+++ b/build/apex/runtests.sh
@@ -207,7 +207,7 @@
art_apex_test_args="$art_apex_test_args --deapexer $HOST_OUT/bin/deapexer"
art_apex_test_args="$art_apex_test_args --debugfs $HOST_OUT/bin/debugfs_static"
art_apex_test_args="$art_apex_test_args --fsckerofs $HOST_OUT/bin/fsck.erofs"
- art_apex_test_args="$art_apex_test_args --blkid $HOST_OUT/bin/blkid"
+ art_apex_test_args="$art_apex_test_args --blkid $HOST_OUT/bin/blkid_static"
fi
case $apex_module in
(*.debug) test_only_args="--flavor debug";;
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 637a770..1622552 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -167,7 +167,7 @@
# Extract prebuilt APEXes.
debugfs=$ANDROID_HOST_OUT/bin/debugfs_static
fsckerofs=$ANDROID_HOST_OUT/bin/fsck.erofs
- blkid=$ANDROID_HOST_OUT/bin/blkid
+ blkid=$ANDROID_HOST_OUT/bin/blkid_static
for apex in ${apexes[@]}; do
dir="$ANDROID_PRODUCT_OUT/system/apex/${apex}"
apexbase="$ANDROID_PRODUCT_OUT/system/apex/${apex}"
diff --git a/tools/buildbot-sync.sh b/tools/buildbot-sync.sh
index afc0691..ba49c61 100755
--- a/tools/buildbot-sync.sh
+++ b/tools/buildbot-sync.sh
@@ -96,7 +96,7 @@
mkdir -p $src_apex_path
$ANDROID_HOST_OUT/bin/deapexer --debugfs_path $ANDROID_HOST_OUT/bin/debugfs_static \
--fsckerofs_path $ANDROID_HOST_OUT/bin/fsck.erofs \
- --blkid_path $ANDROID_HOST_OUT/bin/blkid \
+ --blkid_path $ANDROID_HOST_OUT/bin/blkid_static \
extract ${src_apex_file} $src_apex_path
fi