Merge "Move some recovery packages out of base_system."

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 \

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 \