commit 7ec05d0d8cd07996a9a94baf6d21e4e3bb2b79ff
author Jiyong Park <jiyong@google.com> Mon Jul 22 12:26:04 2024 +0900
committer Jiyong Park <jiyong@google.com> Tue Jul 23 00:43:51 2024 +0900
tree cc24fbac06b212cbdcc600322f47afddb8807595
parent 7bd991745d30dfec726267dee31c0ba1ae05f346

Move microdroid_manager to under guest

Bug: 352458998
Test: pass TH
Change-Id: Ief00e6889510566412f451213421f55cf3c1dccd

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 70a3a08..58aff90 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -117,7 +117,7 @@
       "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "path": "packages/modules/Virtualization/microdroid_manager"
+      "path": "packages/modules/Virtualization/guest/microdroid_manager"
     },
     {
       "path": "packages/modules/Virtualization/pvmfw"

guest/microdroid_manager/Android.bp

diff --git a/microdroid_manager/Android.bp b/guest/microdroid_manager/Android.bp
similarity index 100%
rename from microdroid_manager/Android.bp
rename to guest/microdroid_manager/Android.bp

guest/microdroid_manager/TEST_MAPPING

diff --git a/microdroid_manager/TEST_MAPPING b/guest/microdroid_manager/TEST_MAPPING
similarity index 100%
rename from microdroid_manager/TEST_MAPPING
rename to guest/microdroid_manager/TEST_MAPPING

guest/microdroid_manager/aidl/Android.bp

diff --git a/microdroid_manager/aidl/Android.bp b/guest/microdroid_manager/aidl/Android.bp
similarity index 100%
rename from microdroid_manager/aidl/Android.bp
rename to guest/microdroid_manager/aidl/Android.bp

guest/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl

diff --git a/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl b/guest/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl
similarity index 100%
rename from microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl
rename to guest/microdroid_manager/aidl/android/system/virtualization/payload/IVmPayloadService.aidl

guest/microdroid_manager/microdroid_manager.rc

diff --git a/microdroid_manager/microdroid_manager.rc b/guest/microdroid_manager/microdroid_manager.rc
similarity index 100%
rename from microdroid_manager/microdroid_manager.rc
rename to guest/microdroid_manager/microdroid_manager.rc

guest/microdroid_manager/src/dice.rs

diff --git a/microdroid_manager/src/dice.rs b/guest/microdroid_manager/src/dice.rs
similarity index 100%
rename from microdroid_manager/src/dice.rs
rename to guest/microdroid_manager/src/dice.rs

guest/microdroid_manager/src/instance.rs

diff --git a/microdroid_manager/src/instance.rs b/guest/microdroid_manager/src/instance.rs
similarity index 100%
rename from microdroid_manager/src/instance.rs
rename to guest/microdroid_manager/src/instance.rs

guest/microdroid_manager/src/ioutil.rs

diff --git a/microdroid_manager/src/ioutil.rs b/guest/microdroid_manager/src/ioutil.rs
similarity index 100%
rename from microdroid_manager/src/ioutil.rs
rename to guest/microdroid_manager/src/ioutil.rs

guest/microdroid_manager/src/main.rs

diff --git a/microdroid_manager/src/main.rs b/guest/microdroid_manager/src/main.rs
similarity index 100%
rename from microdroid_manager/src/main.rs
rename to guest/microdroid_manager/src/main.rs

guest/microdroid_manager/src/payload.rs

diff --git a/microdroid_manager/src/payload.rs b/guest/microdroid_manager/src/payload.rs
similarity index 100%
rename from microdroid_manager/src/payload.rs
rename to guest/microdroid_manager/src/payload.rs

guest/microdroid_manager/src/swap.rs

diff --git a/microdroid_manager/src/swap.rs b/guest/microdroid_manager/src/swap.rs
similarity index 100%
rename from microdroid_manager/src/swap.rs
rename to guest/microdroid_manager/src/swap.rs

guest/microdroid_manager/src/verify.rs

diff --git a/microdroid_manager/src/verify.rs b/guest/microdroid_manager/src/verify.rs
similarity index 100%
rename from microdroid_manager/src/verify.rs
rename to guest/microdroid_manager/src/verify.rs

guest/microdroid_manager/src/vm_payload_service.rs

diff --git a/microdroid_manager/src/vm_payload_service.rs b/guest/microdroid_manager/src/vm_payload_service.rs
similarity index 100%
rename from microdroid_manager/src/vm_payload_service.rs
rename to guest/microdroid_manager/src/vm_payload_service.rs

guest/microdroid_manager/src/vm_secret.rs

diff --git a/microdroid_manager/src/vm_secret.rs b/guest/microdroid_manager/src/vm_secret.rs
similarity index 100%
rename from microdroid_manager/src/vm_secret.rs
rename to guest/microdroid_manager/src/vm_secret.rs

pvmfw/src/instance.rs

diff --git a/pvmfw/src/instance.rs b/pvmfw/src/instance.rs
index 43c7442..0ef57dc 100644
--- a/pvmfw/src/instance.rs
+++ b/pvmfw/src/instance.rs
@@ -237,7 +237,7 @@
 
 /// Marks the start of an instance.img entry.
 ///
-/// Note: Virtualization/microdroid_manager/src/instance.rs uses the name "partition".
+/// Note: Virtualization/guest/microdroid_manager/src/instance.rs uses the name "partition".
 #[derive(AsBytes, FromZeroes, FromBytes)]
 #[repr(C, packed)]
 struct EntryHeader {