commit 28c7944e5bac07f87aefcc0fa525b53fdba17b30
author Dennis Shen <dzshen@google.com> Tue Nov 08 14:26:13 2022 +0000
committer Dennis Shen <dzshen@google.com> Tue Nov 08 20:57:36 2022 +0000
tree 9bb25a2b0caadb8b21718a08f018a1fb359f7207
parent 20696d97901ed3f00d1f872da375800f29f63776

Include blkid and fsck.erofs in deapexer call

BUG: b/255963179, b/240288941
Change-Id: I2426b2eea9fe7126fdf7a9bb46dbc308ae9d84c5

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 52f4384..e0ca9bf 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -123,6 +123,8 @@
         // deapexer
         "deapexer",
         "debugfs_static",
+        "blkid",
+        "fsck.erofs",
 
         // sign_virt_apex
         "avbtool",

apex/sign_virt_apex_test.sh

diff --git a/apex/sign_virt_apex_test.sh b/apex/sign_virt_apex_test.sh
index 640a3d4..03a56ca 100644
--- a/apex/sign_virt_apex_test.sh
+++ b/apex/sign_virt_apex_test.sh
@@ -23,8 +23,11 @@
 # 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 extract $TEST_DIR/com.android.virt.apex $TMP_ROOT
+deapexer --debugfs_path $DEBUGFS --blkid_path $BLKID --fsckerofs_path $FSCKEROFS \
+  extract $TEST_DIR/com.android.virt.apex $TMP_ROOT
 
 if [ "$(ls -A $TMP_ROOT/etc/fs/)" ]; then
   sign_virt_apex $TEST_DIR/test.com.android.virt.pem $TMP_ROOT