pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include blkid and fsck.erofs in deapexer call 

BUG: b/255963179, b/240288941
Change-Id: I2426b2eea9fe7126fdf7a9bb46dbc308ae9d84c5
This commit is contained in:
Dennis Shen 2022-11-08 14:26:13 +00:00
parent 20696d9790
commit 28c7944e5b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apex/Android.bp
View File

@ -123,6 +123,8 @@ sh_test_host {
// deapexer
"deapexer",
"debugfs_static",
"blkid",
"fsck.erofs",
// sign_virt_apex
"avbtool",

5
apex/sign_virt_apex_test.sh
View File

@ -23,8 +23,11 @@ TEST_DIR=$(dirname $0)
# 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