Merge "Move some recovery packages out of base_system."

am: 59497d050c

Change-Id: I66d93959982eeb656f6ffffc34be6c30c262b323
This commit is contained in:
Anton Hansson 2018-06-29 00:14:48 -07:00 committed by android-build-merger
commit 267e989bad
2 changed files with 8 additions and 5 deletions

View File

@ -20,7 +20,6 @@ PRODUCT_PACKAGES += \
95-configured \ 95-configured \
adb \ adb \
adbd \ adbd \
adbd.recovery \
am \ am \
android.hidl.allocator@1.0-service \ android.hidl.allocator@1.0-service \
android.hidl.base-V1.0-java \ android.hidl.base-V1.0-java \
@ -98,7 +97,6 @@ PRODUCT_PACKAGES += \
ip-up-vpn \ ip-up-vpn \
javax.obex \ javax.obex \
keystore \ keystore \
ld.config.recovery.txt \
ld.config.txt \ ld.config.txt \
ld.mc \ ld.mc \
libaaudio \ libaaudio \
@ -190,7 +188,6 @@ PRODUCT_PACKAGES += \
libwifi-service \ libwifi-service \
libwilhelm \ libwilhelm \
linker \ linker \
linker.recovery \
lmkd \ lmkd \
locksettings \ locksettings \
logcat \ logcat \
@ -219,7 +216,6 @@ PRODUCT_PACKAGES += \
pppd \ pppd \
privapp-permissions-platform.xml \ privapp-permissions-platform.xml \
racoon \ racoon \
recovery \
resize2fs \ resize2fs \
run-as \ run-as \
schedtest \ schedtest \
@ -236,7 +232,6 @@ PRODUCT_PACKAGES += \
SettingsProvider \ SettingsProvider \
sgdisk \ sgdisk \
Shell \ Shell \
shell_and_utilities_recovery \
shell_and_utilities_system \ shell_and_utilities_system \
sm \ sm \
statsd \ statsd \

View File

@ -14,6 +14,14 @@
# limitations under the License. # 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. # Base modules and settings for the vendor partition.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.cas@1.0-service \ android.hardware.cas@1.0-service \