commit f1aaf3458c0a7e82f0dc21315e654dc5d6bb8136
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 25 16:56:16 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 25 16:56:16 2021 +0000
tree d73f5da4caad38d52078515f86b9985333f92111
parent f2998f87933b4b735ceb90e47c202c02e56be14b
parent e67e612549e7a3e0b5e75c2c705856922847e00e

Snap for 7493928 from e67e612549e7a3e0b5e75c2c705856922847e00e to sc-v2-release

Change-Id: I0f3fdc93cde57eb2dfa0318a987234da432869ab

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 55075ca..0c6afd1 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -147,9 +147,7 @@
     ],
 }
 
-// TODO(jiyong): change the name to init, cause it's confusing
-microdroid_boot_cmdline = "rdinit=/bin/init_vendor " +
-    "panic=-1 " +
+microdroid_boot_cmdline = "panic=-1 " +
     // TODO(b/181936135) make the ratelimiting conditional; ratelimiting on prod build
     "printk.devkmsg=on " +
     "androidboot.first_stage_console=1 " +
@@ -186,7 +184,7 @@
 android_filesystem {
     name: "microdroid_ramdisk-5.10",
     deps: [
-        "init_first_stage_soong",
+        "init_first_stage",
     ],
     dirs: [
         "dev",