From db819f5a7dfeb86d3481a90de414c06afa00d0df Mon Sep 17 00:00:00 2001
From: Yi-Yo Chiang <yochiang@google.com>
Date: Fri, 30 Jul 2021 22:22:29 +0800
Subject: [PATCH] fs_mgr: Separate the required modules of core and recovery
 variants

Bug: 191369319
Test: Presubmit
Test: Verify libfs_mgr.recovery no longer depends on core variation
  modules in the ninja graph.
Change-Id: I3c8b1f3d00ff9a67f4d9ea552052e308e550c403
---
 fs_mgr/Android.bp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp
index abd2483cf..5896c4a75 100644
--- a/fs_mgr/Android.bp
+++ b/fs_mgr/Android.bp
@@ -126,10 +126,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.