commit 94fe41919dc7f858697359ab59a5d67111802e7d
author Jiyong Park <jiyong@google.com> Mon Jul 22 12:34:58 2024 +0900
committer Jiyong Park <jiyong@google.com> Tue Jul 23 00:43:51 2024 +0900
tree 93d7a91599fb4a46f056509bb565b2f7e9572798
parent ee9dbf9df3c5cfee0dfa1037e627fa6578b7da56

Move microdroid/payload to libs/libmicrodroid_payload_metadata

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

README.md

diff --git a/README.md b/README.md
index c89cc31..e419b18 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 * [Android Boot Loader (ABL)](docs/abl.md)
 * [Microdroid](microdroid/README.md)
 * [Microdroid kernel](microdroid/kernel/README.md)
-* [Microdroid payload](microdroid/payload/README.md)
+* [Microdroid payload](libs/libmicrodroid_payload_metadata/README.md)
 * [vmbase](vmbase/README.md)
 * [Encrypted Storage](guest/encryptedstore/README.md)
 

java/framework/src/android/system/virtualmachine/VirtualMachine.java

diff --git a/java/framework/src/android/system/virtualmachine/VirtualMachine.java b/java/framework/src/android/system/virtualmachine/VirtualMachine.java
index edfc558..c3f11d1 100644
--- a/java/framework/src/android/system/virtualmachine/VirtualMachine.java
+++ b/java/framework/src/android/system/virtualmachine/VirtualMachine.java
@@ -2171,7 +2171,7 @@
     private static List<String> parseExtraApkListFromPayloadConfig(JsonReader reader)
             throws VirtualMachineException {
         /*
-         * JSON schema from packages/modules/Virtualization/microdroid/payload/config/src/lib.rs:
+         * JSON schema from packages/modules/Virtualization/microdroid/libs/libmicrodroid_payload_metadata/config/src/lib.rs:
          *
          * <p>{ "extra_apks": [ { "path": "/system/app/foo.apk", }, ... ], ... }
          */

java/framework/src/android/system/virtualmachine/VirtualMachineConfig.java

diff --git a/java/framework/src/android/system/virtualmachine/VirtualMachineConfig.java b/java/framework/src/android/system/virtualmachine/VirtualMachineConfig.java
index a2d8ee6..26dc3ab 100644
--- a/java/framework/src/android/system/virtualmachine/VirtualMachineConfig.java
+++ b/java/framework/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -1013,7 +1013,8 @@
         /**
          * Sets the path within the APK to the payload config file that defines software aspects of
          * the VM. The file is a JSON file; see
-         * packages/modules/Virtualization/microdroid/payload/config/src/lib.rs for the format.
+         * packages/modules/Virtualization/libs/libmicrodroid_payload_metadata/config/src/lib.rs for
+         * the format.
          *
          * @hide
          */

libs/libmicrodroid_payload_metadata/Android.bp

diff --git a/microdroid/payload/Android.bp b/libs/libmicrodroid_payload_metadata/Android.bp
similarity index 100%
rename from microdroid/payload/Android.bp
rename to libs/libmicrodroid_payload_metadata/Android.bp

libs/libmicrodroid_payload_metadata/README.md

diff --git a/microdroid/payload/README.md b/libs/libmicrodroid_payload_metadata/README.md
similarity index 100%
rename from microdroid/payload/README.md
rename to libs/libmicrodroid_payload_metadata/README.md

libs/libmicrodroid_payload_metadata/config/Android.bp

diff --git a/microdroid/payload/config/Android.bp b/libs/libmicrodroid_payload_metadata/config/Android.bp
similarity index 100%
rename from microdroid/payload/config/Android.bp
rename to libs/libmicrodroid_payload_metadata/config/Android.bp

libs/libmicrodroid_payload_metadata/config/src/lib.rs

diff --git a/microdroid/payload/config/src/lib.rs b/libs/libmicrodroid_payload_metadata/config/src/lib.rs
similarity index 100%
rename from microdroid/payload/config/src/lib.rs
rename to libs/libmicrodroid_payload_metadata/config/src/lib.rs

libs/libmicrodroid_payload_metadata/include/microdroid/metadata.h

diff --git a/microdroid/payload/include/microdroid/metadata.h b/libs/libmicrodroid_payload_metadata/include/microdroid/metadata.h
similarity index 100%
rename from microdroid/payload/include/microdroid/metadata.h
rename to libs/libmicrodroid_payload_metadata/include/microdroid/metadata.h

libs/libmicrodroid_payload_metadata/metadata.cc

diff --git a/microdroid/payload/metadata.cc b/libs/libmicrodroid_payload_metadata/metadata.cc
similarity index 100%
rename from microdroid/payload/metadata.cc
rename to libs/libmicrodroid_payload_metadata/metadata.cc

libs/libmicrodroid_payload_metadata/metadata.proto

diff --git a/microdroid/payload/metadata.proto b/libs/libmicrodroid_payload_metadata/metadata.proto
similarity index 100%
rename from microdroid/payload/metadata.proto
rename to libs/libmicrodroid_payload_metadata/metadata.proto

libs/libmicrodroid_payload_metadata/metadata/Android.bp

diff --git a/microdroid/payload/metadata/Android.bp b/libs/libmicrodroid_payload_metadata/metadata/Android.bp
similarity index 100%
rename from microdroid/payload/metadata/Android.bp
rename to libs/libmicrodroid_payload_metadata/metadata/Android.bp

libs/libmicrodroid_payload_metadata/metadata/src/lib.rs

diff --git a/microdroid/payload/metadata/src/lib.rs b/libs/libmicrodroid_payload_metadata/metadata/src/lib.rs
similarity index 100%
rename from microdroid/payload/metadata/src/lib.rs
rename to libs/libmicrodroid_payload_metadata/metadata/src/lib.rs

libs/libmicrodroid_payload_metadata/src/com/android/virt/PayloadMetadata.java

diff --git a/microdroid/payload/src/com/android/virt/PayloadMetadata.java b/libs/libmicrodroid_payload_metadata/src/com/android/virt/PayloadMetadata.java
similarity index 100%
rename from microdroid/payload/src/com/android/virt/PayloadMetadata.java
rename to libs/libmicrodroid_payload_metadata/src/com/android/virt/PayloadMetadata.java