Merge "Move some recovery packages out of base_system."

This commit is contained in:
Anton Hansson 2018-06-29 07:06:22 +00:00 committed by Gerrit Code Review
commit 59497d050c
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 \
@ -95,7 +94,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 \
@ -186,7 +184,6 @@ PRODUCT_PACKAGES += \
libwifi-service \ libwifi-service \
libwilhelm \ libwilhelm \
linker \ linker \
linker.recovery \
lmkd \ lmkd \
locksettings \ locksettings \
logcat \ logcat \
@ -215,7 +212,6 @@ PRODUCT_PACKAGES += \
pppd \ pppd \
privapp-permissions-platform.xml \ privapp-permissions-platform.xml \
racoon \ racoon \
recovery \
resize2fs \ resize2fs \
run-as \ run-as \
schedtest \ schedtest \
@ -231,7 +227,6 @@ PRODUCT_PACKAGES += \
SettingsProvider \ SettingsProvider \
sgdisk \ sgdisk \
Shell \ Shell \
shell_and_utilities_recovery \
shell_and_utilities_system \ shell_and_utilities_system \
sm \ sm \
storaged \ storaged \

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 \