commit 81dad902f67fcf8db1afe920d86536e19bb65be5
author Yi-Yo Chiang <yochiang@google.com> Fri Jul 30 10:09:40 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 30 10:09:40 2021 +0000
tree 4d270e7cd58397f815aa38a69a37c0d0673f232b
parent 3acae5450f0aa269c3b7c093fb767f1969b3c0cc
parent 9ba6a5b8a20019e6e65fb8c79d2ce2dbd644ed3b

Merge "init: Separate the required modules of core and recovery variants"

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 3e8d4e3..a04d2db 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -228,17 +228,19 @@
     stem: "init",
     defaults: ["init_defaults"],
     static_libs: ["libinit"],
-    required: [
-        "e2fsdroid",
-        "init.rc",
-        "mke2fs",
-        "sload_f2fs",
-        "make_f2fs",
-        "ueventd.rc",
-    ],
     srcs: ["main.cpp"],
     symlinks: ["ueventd"],
     target: {
+        platform: {
+            required: [
+                "init.rc",
+                "ueventd.rc",
+                "e2fsdroid",
+                "make_f2fs",
+                "mke2fs",
+                "sload_f2fs",
+            ],
+        },
         recovery: {
             cflags: ["-DRECOVERY"],
             exclude_static_libs: [
@@ -248,6 +250,14 @@
                 "libbinder",
                 "libutils",
             ],
+            required: [
+                "init_recovery.rc",
+                "ueventd.rc.recovery",
+                "e2fsdroid.recovery",
+                "make_f2fs.recovery",
+                "mke2fs.recovery",
+                "sload_f2fs.recovery",
+            ],
         },
     },
     visibility: ["//packages/modules/Virtualization/microdroid"],