Merge "Remove --blkid_path argument" am: 6e5a621120 am: c9d398c889 am: 0be3f2e936
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2624312
Change-Id: Ic894810a859db20c31435a8e53026307b2723432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/apex/Android.bp b/apex/Android.bp
index 2dc90d6..fedcfcd 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -166,7 +166,6 @@
// deapexer
"deapexer",
"debugfs_static",
- "blkid",
"fsck.erofs",
// sign_virt_apex
diff --git a/apex/sign_virt_apex_test.sh b/apex/sign_virt_apex_test.sh
index 03a56ca..e6a892b 100644
--- a/apex/sign_virt_apex_test.sh
+++ b/apex/sign_virt_apex_test.sh
@@ -23,10 +23,9 @@
# To access host tools
PATH=$TEST_DIR:$PATH
DEBUGFS=$TEST_DIR/debugfs_static
-BLKID=$TEST_DIR/blkid
FSCKEROFS=$TEST_DIR/fsck.erofs
-deapexer --debugfs_path $DEBUGFS --blkid_path $BLKID --fsckerofs_path $FSCKEROFS \
+deapexer --debugfs_path $DEBUGFS --fsckerofs_path $FSCKEROFS \
extract $TEST_DIR/com.android.virt.apex $TMP_ROOT
if [ "$(ls -A $TMP_ROOT/etc/fs/)" ]; then