Merge "fs_mgr: Separate the required modules of core and recovery variants" am: 0e13b0ebb4 am: 0df7808cb2 am: 634c270aaa am: 88920e1003 am: 1ee68d92e1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1782809 Change-Id: I81d1a4fa2d8a6fcc22b2f4ac8538e71d32840735
2021-08-18 06:31:59 +00:00 · 2021-08-18 06:31:59 +00:00 · 4c5a36f7c7
commit 4c5a36f7c7
parent 4d38a0f4fd 1ee68d92e1
1 changed files with 13 additions and 4 deletions
--- a/fs_mgr/Android.bp
+++ b/fs_mgr/Android.bp
@ -127,10 +127,19 @@ cc_defaults {
    export_header_lib_headers: [
        "libfiemap_headers",
    ],
-    required: [
-        "e2freefrag",
-        "e2fsdroid",
-    ],
+    target: {
+        platform: {
+            required: [
+                "e2freefrag",
+                "e2fsdroid",
+            ],
+        },
+        recovery: {
+            required: [
+                "e2fsdroid.recovery",
+            ],
+        },
+    },
 }

 // Two variants of libfs_mgr are provided: libfs_mgr and libfs_mgr_binder.