| commit | c9d398c8899b4a37a10f7f988e8aee8045e3d915 | [log] [tgz] |
|---|---|---|
| author | Jooyung Han <jooyung@google.com> | Fri Jun 16 08:59:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 16 08:59:25 2023 +0000 |
| tree | 5e805c00ab83222e66128cc66f2ffa711bde9186 | |
| parent | 8f4b2777f659fe91169a710a5d213dff4a2c36a6 [diff] | |
| parent | 6e5a6211202a28e81485076ae078b9da887a3401 [diff] |
Merge "Remove --blkid_path argument" am: 6e5a621120 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2624312 Change-Id: Ib7c3683c97befef25c2303546d596b5df506c89a 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