Fix partition check on /data/nativetest/vendor
Also fixes VTS.
Bug: 399812221
Test: atest vts_libavf_test
Change-Id: I0458fd899bb2cdd1758824c6bb827e89379af0c8
diff --git a/tests/vts/AndroidTest.xml b/tests/vts/AndroidTest.xml
index 6926f9f..a59f161 100644
--- a/tests/vts/AndroidTest.xml
+++ b/tests/vts/AndroidTest.xml
@@ -21,7 +21,7 @@
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
<option name="push" value="vts_libavf_test->/data/nativetest64/vendor/vts_libavf_test" />
- <option name="push" value="rialto.bin->/data/local/tmp/rialto.bin" />
+ <option name="push" value="rialto.bin->/data/nativetest64/vendor/rialto.bin" />
</target_preparer>
<object type="module_controller" class="com.android.tradefed.testtype.suite.module.ArchModuleController">
diff --git a/tests/vts/src/vts_libavf_test.rs b/tests/vts/src/vts_libavf_test.rs
index dc37aad..c13b510 100644
--- a/tests/vts/src/vts_libavf_test.rs
+++ b/tests/vts/src/vts_libavf_test.rs
@@ -75,7 +75,7 @@
fn run_rialto(protected_vm: bool) -> Result<()> {
let kernel_file =
- File::open("/data/local/tmp/rialto.bin").context("Failed to open kernel file")?;
+ File::open("/data/nativetest64/vendor/rialto.bin").context("Failed to open kernel file")?;
let kernel_fd = kernel_file.into_raw_fd();
// SAFETY: AVirtualMachineRawConfig_create() isn't unsafe but rust_bindgen forces it to be seen