From 30417d971edb7467aff8b888ae9510c5c2324790 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 28 Jun 2018 16:50:42 +0100
Subject: [PATCH] Move some recovery packages out of base_system.

Put the in base_vendor for now. That file should probably be renamed
to base_nonsystem.mk or something of that sort.

There is a remaining artifacts in recovery, but I think its target
needs to be split up, so move these for now.

Bug: 80410283
Test: make
Change-Id: I98c2b96b413fff4c8b0377e69bc9c2693ccca7cd
---
 target/product/base_system.mk | 5 -----
 target/product/base_vendor.mk | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 9db5d43358..46c3416115 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -20,7 +20,6 @@ PRODUCT_PACKAGES += \
     95-configured \
     adb \
     adbd \
-    adbd.recovery \
     am \
     android.hidl.allocator@1.0-service \
     android.hidl.base-V1.0-java \
@@ -95,7 +94,6 @@ PRODUCT_PACKAGES += \
     ip-up-vpn \
     javax.obex \
     keystore \
-    ld.config.recovery.txt \
     ld.config.txt \
     ld.mc \
     libaaudio \
@@ -186,7 +184,6 @@ PRODUCT_PACKAGES += \
     libwifi-service \
     libwilhelm \
     linker \
-    linker.recovery \
     lmkd \
     locksettings \
     logcat \
@@ -215,7 +212,6 @@ PRODUCT_PACKAGES += \
     pppd \
     privapp-permissions-platform.xml \
     racoon \
-    recovery \
     resize2fs \
     run-as \
     schedtest \
@@ -231,7 +227,6 @@ PRODUCT_PACKAGES += \
     SettingsProvider \
     sgdisk \
     Shell \
-    shell_and_utilities_recovery \
     shell_and_utilities_system \
     sm \
     storaged \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 4596cb6a89..678b60af2e 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -14,6 +14,14 @@
 # limitations under the License.
 #
 
+# Base modules and settings for recovery.
+PRODUCT_PACKAGES += \
+    adbd.recovery \
+    ld.config.recovery.txt \
+    linker.recovery \
+    recovery \
+    shell_and_utilities_recovery \
+
 # Base modules and settings for the vendor partition.
 PRODUCT_PACKAGES += \
     android.hardware.cas@1.0-service \