Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future
diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index e98ab5c..eefaa65 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -487,6 +487,12 @@
if path.starts_with("/system/product/") {
return Ok(CallingPartition::Product);
}
+ if path.starts_with("/data/nativetest/vendor/")
+ || path.starts_with("/data/nativetest64/vendor/")
+ {
+ return Ok(CallingPartition::Vendor);
+ }
+
let partition = {
let mut components = path.components();
let Some(std::path::Component::Normal(partition)) = components.nth(1) else {
@@ -2794,6 +2800,14 @@
}
#[test]
+ fn test_vendor_in_data() {
+ assert_eq!(
+ CallingPartition::Vendor,
+ find_partition(Some(Path::new("/data/nativetest64/vendor/file"))).unwrap()
+ );
+ }
+
+ #[test]
fn early_vm_exe_paths_match_succeeds_with_same_paths() {
let early_vm = EarlyVm {
name: "vm_demo_native_early".to_owned(),
diff --git a/build/debian/build.sh b/build/debian/build.sh
index 63035ae..5aa3f28 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -114,14 +114,6 @@
)
fi
- # TODO(b/365955006): remove these lines when uboot supports x86_64 EFI application
- if [[ "$arch" == "x86_64" ]]; then
- packages+=(
- libguestfs-tools
- linux-image-generic
- )
- fi
-
if [[ "$use_generic_kernel" != 1 ]]; then
packages+=(
bc
@@ -355,31 +347,17 @@
fi
sed -i "s/{efi_part_guid}/$(sfdisk --part-uuid $raw_disk_image $efi_partition_num)/g" vm_config.json
- images=()
- if [[ "$arch" == "aarch64" ]]; then
- images+=(
- root_part
- efi_part
- )
- # TODO(b/365955006): remove these lines when uboot supports x86_64 EFI application
- elif [[ "$arch" == "x86_64" ]]; then
- rm -f vmlinuz initrd.img
- virt-get-kernel -a "${raw_disk_image}"
- mv vmlinuz* vmlinuz
- mv initrd.img* initrd.img
- images+=(
- bios_part
- root_part
- efi_part
- vmlinuz
- initrd.img
- )
- fi
-
popd > /dev/null
+ contents=(
+ build_id
+ root_part
+ efi_part
+ vm_config.json
+ )
+
# --sparse option isn't supported in apache-commons-compress
- tar czv -f ${output} -C ${workdir} build_id "${images[@]}" vm_config.json
+ tar czv -f ${output} -C ${workdir} "${contents[@]}"
}
clean_up() {
diff --git a/build/debian/vm_config.json.x86_64 b/build/debian/vm_config.json.x86_64
index bc4e00a..463583f 100644
--- a/build/debian/vm_config.json.x86_64
+++ b/build/debian/vm_config.json.x86_64
@@ -10,12 +10,6 @@
"guid": "{root_part_guid}"
},
{
- "label": "BIOS",
- "path": "$PAYLOAD_DIR/bios_part",
- "writable": true,
- "guid": "{bios_part_guid}"
- },
- {
"label": "EFI",
"path": "$PAYLOAD_DIR/efi_part",
"writable": false,
@@ -33,9 +27,6 @@
"sharedPath": "$APP_DATA_DIR/files"
}
],
- "kernel": "$PAYLOAD_DIR/vmlinuz",
- "initrd": "$PAYLOAD_DIR/initrd.img",
- "params": "root=/dev/vda1",
"protected": false,
"cpu_topology": "match_host",
"platform_version": "~1.0",
diff --git a/guest/apkdmverity/Android.bp b/guest/apkdmverity/Android.bp
index 3f45bb4..6e928f6 100644
--- a/guest/apkdmverity/Android.bp
+++ b/guest/apkdmverity/Android.bp
@@ -41,7 +41,6 @@
name: "apkdmverity.test",
defaults: [
"apkdmverity.defaults",
- "rdroidtest.defaults",
],
test_suites: ["general-tests"],
compile_multilib: "first",
diff --git a/guest/apkdmverity/src/main.rs b/guest/apkdmverity/src/main.rs
index 2fc964b..167f5d4 100644
--- a/guest/apkdmverity/src/main.rs
+++ b/guest/apkdmverity/src/main.rs
@@ -160,12 +160,8 @@
}
#[cfg(test)]
-rdroidtest::test_main!();
-
-#[cfg(test)]
mod tests {
use crate::*;
- use rdroidtest::{ignore_if, rdroidtest};
use std::fs::{File, OpenOptions};
use std::io::Write;
use std::ops::Deref;
@@ -236,9 +232,11 @@
});
}
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn correct_inputs() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
run_test(apk.as_ref(), idsig.as_ref(), "correct", |ctx| {
@@ -250,9 +248,11 @@
}
// A single byte change in the APK file causes an IO error
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn incorrect_apk() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
@@ -268,9 +268,11 @@
}
// A single byte change in the merkle tree also causes an IO error
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn incorrect_merkle_tree() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
@@ -293,9 +295,11 @@
// APK is not altered when the verity device is created, but later modified. IO error should
// occur when trying to read the data around the modified location. This is the main scenario
// that we'd like to protect.
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn tampered_apk() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
@@ -315,9 +319,11 @@
// idsig file is not alread when the verity device is created, but later modified. Unlike to
// the APK case, this doesn't occur IO error because the merkle tree is already cached.
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn tampered_idsig() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
run_test(apk.as_ref(), idsig.as_ref(), "tampered_idsig", |ctx| {
@@ -333,9 +339,11 @@
}
// test if both files are already block devices
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn inputs_are_block_devices() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
@@ -383,9 +391,11 @@
}
// test with custom roothash
- #[rdroidtest]
- #[ignore_if(should_skip())]
+ #[test]
fn correct_custom_roothash() {
+ if should_skip() {
+ return;
+ }
let apk = include_bytes!("../testdata/test.apk");
let idsig = include_bytes!("../testdata/test.apk.idsig");
let roothash = V4Signature::from_idsig_path("testdata/test.apk.idsig")
@@ -406,7 +416,7 @@
);
}
- #[rdroidtest]
+ #[test]
fn verify_command() {
// Check that the command parsing has been configured in a valid way.
clap_command().debug_assert();
diff --git a/libs/devicemapper/Android.bp b/libs/devicemapper/Android.bp
index 6b7f680..8dc6c8d 100644
--- a/libs/devicemapper/Android.bp
+++ b/libs/devicemapper/Android.bp
@@ -29,7 +29,6 @@
name: "libdm_rust.test",
defaults: [
"libdm_rust.defaults",
- "rdroidtest.defaults",
],
test_suites: ["general-tests"],
rustlibs: [
diff --git a/libs/devicemapper/src/lib.rs b/libs/devicemapper/src/lib.rs
index a8c2833..bc8a762 100644
--- a/libs/devicemapper/src/lib.rs
+++ b/libs/devicemapper/src/lib.rs
@@ -230,14 +230,10 @@
}
#[cfg(test)]
-rdroidtest::test_main!();
-
-#[cfg(test)]
mod tests {
use super::*;
use crate::loopdevice::LoopConfigOptions;
use crypt::{CipherType, DmCryptTargetBuilder};
- use rdroidtest::{ignore_if, rdroidtest};
use rustutils::system_properties;
use std::fs::{read, File, OpenOptions};
use std::io::Write;
@@ -294,25 +290,29 @@
}
}
- #[rdroidtest]
+ #[test]
fn mapping_again_keeps_data_xts() {
mapping_again_keeps_data(&KEY_SET_XTS, "name1");
}
- #[rdroidtest]
- #[ignore_if(!is_hctr2_supported())]
+ #[test]
fn mapping_again_keeps_data_hctr2() {
+ if !is_hctr2_supported() {
+ return;
+ }
mapping_again_keeps_data(&KEY_SET_HCTR2, "name2");
}
- #[rdroidtest]
+ #[test]
fn data_inaccessible_with_diff_key_xts() {
data_inaccessible_with_diff_key(&KEY_SET_XTS, "name3");
}
- #[rdroidtest]
- #[ignore_if(!is_hctr2_supported())]
+ #[test]
fn data_inaccessible_with_diff_key_hctr2() {
+ if !is_hctr2_supported() {
+ return;
+ }
data_inaccessible_with_diff_key(&KEY_SET_HCTR2, "name4");
}
diff --git a/libs/devicemapper/src/loopdevice.rs b/libs/devicemapper/src/loopdevice.rs
index 30ab6f6..e41b90c 100644
--- a/libs/devicemapper/src/loopdevice.rs
+++ b/libs/devicemapper/src/loopdevice.rs
@@ -179,7 +179,6 @@
#[cfg(test)]
mod tests {
use super::*;
- use rdroidtest::rdroidtest;
use std::fs;
use std::path::Path;
@@ -205,7 +204,7 @@
"1" == fs::read_to_string(autoclear).unwrap().trim()
}
- #[rdroidtest]
+ #[test]
fn attach_loop_device_with_dio() {
let a_dir = tempfile::TempDir::new().unwrap();
let a_file = a_dir.path().join("test");
@@ -221,7 +220,7 @@
assert!(is_direct_io(&dev));
}
- #[rdroidtest]
+ #[test]
fn attach_loop_device_without_dio() {
let a_dir = tempfile::TempDir::new().unwrap();
let a_file = a_dir.path().join("test");
@@ -234,7 +233,7 @@
assert!(!is_direct_io(&dev));
}
- #[rdroidtest]
+ #[test]
fn attach_loop_device_with_dio_writable() {
let a_dir = tempfile::TempDir::new().unwrap();
let a_file = a_dir.path().join("test");
@@ -255,7 +254,7 @@
assert!(is_direct_io_writable(&dev));
}
- #[rdroidtest]
+ #[test]
fn attach_loop_device_autoclear() {
let a_dir = tempfile::TempDir::new().unwrap();
let a_file = a_dir.path().join("test");
diff --git a/tests/vm_accessor/test/Android.bp b/tests/vm_accessor/test/Android.bp
index 71746c7..16e9b1e 100644
--- a/tests/vm_accessor/test/Android.bp
+++ b/tests/vm_accessor/test/Android.bp
@@ -22,9 +22,6 @@
rust_test {
name: "vm_accessor_test",
srcs: ["src/test.rs"],
- defaults: [
- "rdroidtest.defaults",
- ],
test_suites: [
"general-tests",
],
diff --git a/tests/vm_accessor/test/src/test.rs b/tests/vm_accessor/test/src/test.rs
index d521acf..4d25fcd 100644
--- a/tests/vm_accessor/test/src/test.rs
+++ b/tests/vm_accessor/test/src/test.rs
@@ -18,7 +18,6 @@
use com_android_virt_accessor_demo_vm_service::aidl::com::android::virt::accessor_demo::vm_service::IAccessorVmService::IAccessorVmService;
use binder::{Strong, ProcessState};
-use rdroidtest::rdroidtest;
const VM_SERVICE: &str = "com.android.virt.accessor_demo.vm_service.IAccessorVmService/default";
@@ -39,7 +38,7 @@
binder::check_interface(VM_SERVICE).unwrap()
}
-#[rdroidtest]
+#[test]
fn test_wait_for_interface() {
init();
@@ -49,7 +48,7 @@
assert_eq!(sum, 23);
}
-#[rdroidtest]
+#[test]
fn test_wait_for_interface_twice() {
init();
@@ -60,7 +59,7 @@
assert_eq!(service2.add(11, 12).unwrap(), 23);
}
-#[rdroidtest]
+#[test]
fn test_wait_and_get_interface() {
init();
@@ -71,7 +70,7 @@
assert_eq!(service2.add(11, 12).unwrap(), 23);
}
-#[rdroidtest]
+#[test]
fn test_wait_and_check_interface() {
init();
@@ -81,5 +80,3 @@
assert_eq!(service1.add(11, 12).unwrap(), 23);
assert_eq!(service2.add(11, 12).unwrap(), 23);
}
-
-rdroidtest::test_main!();