Rename avfutil to avflog
.. so that it won't become a dump ground.
Bug: 295168844
Test: build
Change-Id: I7e583211ac9d2db0d56fdfa0092c91a123f138ea
diff --git a/libs/avfutil/Android.bp b/libs/avflog/Android.bp
similarity index 67%
rename from libs/avfutil/Android.bp
rename to libs/avflog/Android.bp
index b9b1c19..1ddfc7a 100644
--- a/libs/avfutil/Android.bp
+++ b/libs/avflog/Android.bp
@@ -3,8 +3,8 @@
}
rust_defaults {
- name: "libavfutil.defaults",
- crate_name: "avfutil",
+ name: "libavflog.defaults",
+ crate_name: "avflog",
host_supported: true,
srcs: ["src/lib.rs"],
edition: "2021",
@@ -14,8 +14,8 @@
}
rust_library {
- name: "libavfutil",
- defaults: ["libavfutil.defaults"],
+ name: "libavflog",
+ defaults: ["libavflog.defaults"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
@@ -23,8 +23,8 @@
}
rust_test {
- name: "libavfutil.test",
- defaults: ["libavfutil.defaults"],
+ name: "libavflog.test",
+ defaults: ["libavflog.defaults"],
prefer_rlib: true,
test_suites: ["general-tests"],
}
diff --git a/libs/avfutil/TEST_MAPPING b/libs/avflog/TEST_MAPPING
similarity index 85%
rename from libs/avfutil/TEST_MAPPING
rename to libs/avflog/TEST_MAPPING
index 73bcc20..921c4d8 100644
--- a/libs/avfutil/TEST_MAPPING
+++ b/libs/avflog/TEST_MAPPING
@@ -3,7 +3,7 @@
{
"avf-presubmit" : [
{
- "name" : "libavfutil.test"
+ "name" : "libavflog.test"
}
]
}
diff --git a/libs/avfutil/src/lib.rs b/libs/avflog/src/lib.rs
similarity index 100%
rename from libs/avfutil/src/lib.rs
rename to libs/avflog/src/lib.rs
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index f23c442..23f174e 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -15,7 +15,7 @@
"android.system.virtualization.payload-rust",
"libandroid_logger",
"libanyhow",
- "libavfutil",
+ "libavflog",
"libapexutil_rust",
"libapkverify",
"libbinder_rs",
diff --git a/microdroid_manager/src/vm_payload_service.rs b/microdroid_manager/src/vm_payload_service.rs
index 7cc0826..1e0b574 100644
--- a/microdroid_manager/src/vm_payload_service.rs
+++ b/microdroid_manager/src/vm_payload_service.rs
@@ -19,7 +19,7 @@
BnVmPayloadService, IVmPayloadService, VM_PAYLOAD_SERVICE_SOCKET_NAME};
use android_system_virtualmachineservice::aidl::android::system::virtualmachineservice::IVirtualMachineService::IVirtualMachineService;
use anyhow::{anyhow, Context, Result};
-use avfutil::LogResult;
+use avflog::LogResult;
use binder::{Interface, BinderFeatures, ExceptionCode, Strong, IntoBinderResult};
use diced_open_dice::{DiceArtifacts, OwnedDiceArtifacts};
use log::info;
diff --git a/virtualizationmanager/Android.bp b/virtualizationmanager/Android.bp
index 1b5be9f..de39aa2 100644
--- a/virtualizationmanager/Android.bp
+++ b/virtualizationmanager/Android.bp
@@ -27,7 +27,7 @@
"libandroid_logger",
"libanyhow",
"libapkverify",
- "libavfutil",
+ "libavflog",
"libbase_rust",
"libbinder_rs",
"libclap",
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index b890baf..97151d7 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -50,7 +50,7 @@
};
use anyhow::{anyhow, bail, Context, Result};
use apkverify::{HashAlgorithm, V4Signature};
-use avfutil::LogResult;
+use avflog::LogResult;
use binder::{
self, wait_for_interface, BinderFeatures, ExceptionCode, Interface, ParcelFileDescriptor,
Status, StatusCode, Strong,
diff --git a/virtualizationservice/Android.bp b/virtualizationservice/Android.bp
index 0fc1a2d..67890e2 100644
--- a/virtualizationservice/Android.bp
+++ b/virtualizationservice/Android.bp
@@ -27,7 +27,7 @@
"android.os.permissions_aidl-rust",
"libandroid_logger",
"libanyhow",
- "libavfutil",
+ "libavflog",
"libbinder_rs",
"liblibc",
"liblog_rust",
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 8401aa0..b2513d9 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -33,7 +33,7 @@
};
use android_system_virtualmachineservice::aidl::android::system::virtualmachineservice::IVirtualMachineService::VM_TOMBSTONES_SERVICE_PORT;
use anyhow::{anyhow, ensure, Context, Result};
-use avfutil::LogResult;
+use avflog::LogResult;
use binder::{self, wait_for_interface, BinderFeatures, ExceptionCode, Interface, LazyServiceGuard, Status, Strong, IntoBinderResult};
use libc::VMADDR_CID_HOST;
use log::{error, info, warn};