commit 90f90e7360e6fb492f6943856ebcbf5e14e9dc01
author Pawan Wagh <waghpawan@google.com> Wed Jun 14 18:28:17 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 14 18:28:20 2023 +0000
tree b6ad246848bf36aba8ea8e8f57311f014ea956cf
parent ef7d16ddf08c440071f83f812d7af61cef2c1d49

Revert "Remove vendor partition"

Revert submission 2625691

Reason for revert: b/287283650

Reverted changes: /q/submissionid:2625691

Change-Id: I974c2b96230507d4360f4333608c22e219af9667

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 1395d30..2d05c45 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -16,6 +16,7 @@
     "sys",
 
     "system",
+    "vendor",
     "debug_ramdisk",
     "mnt",
     "data",
@@ -205,6 +206,21 @@
         "echo ro.product.cpu.abi=arm64-v8a) > $(out)",
 }
 
+// TODO(b/285855150): remove.
+android_filesystem {
+    name: "microdroid_vendor",
+    partition_name: "vendor",
+    use_avb: true,
+    avb_private_key: ":microdroid_sign_key",
+    avb_algorithm: "SHA256_RSA4096",
+    avb_hash_algorithm: "sha256",
+    file_contexts: ":microdroid_vendor_file_contexts.gen",
+    // For deterministic output, use fake_timestamp, hard-coded uuid
+    fake_timestamp: "1611569676",
+    // python -c "import uuid; print(uuid.uuid5(uuid.NAMESPACE_URL, 'www.android.com/avf/microdroid/vendor'))"
+    uuid: "156d40d7-8d8e-5c99-8913-ec82de549a70",
+}
+
 logical_partition {
     name: "microdroid_super",
     sparse: true,
@@ -214,6 +230,10 @@
             name: "system_a",
             filesystem: ":microdroid",
         },
+        {
+            name: "vendor_a",
+            filesystem: ":microdroid_vendor",
+        },
     ],
 }
 
@@ -297,6 +317,7 @@
     partition_name: "vbmeta",
     private_key: ":microdroid_sign_key",
     partitions: [
+        "microdroid_vendor",
         "microdroid",
     ],
 }