[apkverify] Merge idsig into apkverify package
This CL merges idsig into apkverify package as apkverify is
supposed to cover apk signature verification v3 and v4.
Bug: 248999133
Test: libapkverify.test apkdmverity.test microdroid_manager_test
Change-Id: Ieef2dcf93496164f8bb72cd4ee819ebb822f6142
diff --git a/virtualizationservice/Android.bp b/virtualizationservice/Android.bp
index 1493cb8..2f4f731 100644
--- a/virtualizationservice/Android.bp
+++ b/virtualizationservice/Android.bp
@@ -26,10 +26,10 @@
"android.os.permissions_aidl-rust",
"libandroid_logger",
"libanyhow",
+ "libapkverify",
"libbinder_rs",
"libcommand_fds",
"libdisk",
- "libidsig",
"liblazy_static",
"liblog_rust",
"libmicrodroid_metadata",
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 1eca9fe..3b75df9 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -47,7 +47,7 @@
use anyhow::{anyhow, bail, Context, Result};
use rpcbinder::run_rpc_server_with_factory;
use disk::QcowFile;
-use idsig::{HashAlgorithm, V4Signature};
+use apkverify::{HashAlgorithm, V4Signature};
use log::{debug, error, info, warn};
use microdroid_payload_config::VmPayloadConfig;
use rustutils::system_properties;