2018-06-26 12:20:34 +02:00
|
|
|
#
|
|
|
|
|
# Copyright (C) 2018 The Android Open Source Project
|
|
|
|
|
#
|
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
|
#
|
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
#
|
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
|
# limitations under the License.
|
|
|
|
|
#
|
|
|
|
|
|
2018-06-28 17:50:42 +02:00
|
|
|
# Base modules and settings for recovery.
|
|
|
|
|
PRODUCT_PACKAGES += \
|
|
|
|
|
adbd.recovery \
|
2018-07-18 20:35:58 +02:00
|
|
|
android.hardware.health@2.0-impl-default.recovery \
|
2019-02-13 03:21:17 +01:00
|
|
|
cgroups.recovery.json \
|
2018-09-11 23:34:27 +02:00
|
|
|
charger.recovery \
|
2018-08-14 15:06:39 +02:00
|
|
|
init_second_stage.recovery \
|
2018-06-28 17:50:42 +02:00
|
|
|
ld.config.recovery.txt \
|
|
|
|
|
linker.recovery \
|
2019-04-19 03:37:32 +02:00
|
|
|
otacerts.recovery \
|
2018-06-28 17:50:42 +02:00
|
|
|
recovery \
|
|
|
|
|
shell_and_utilities_recovery \
|
2018-08-01 22:45:12 +02:00
|
|
|
watchdogd.recovery \
|
2018-06-28 17:50:42 +02:00
|
|
|
|
2019-02-23 00:06:03 +01:00
|
|
|
# These had been pulled in via init_second_stage.recovery, but may not be needed.
|
|
|
|
|
PRODUCT_HOST_PACKAGES += \
|
|
|
|
|
e2fsdroid \
|
|
|
|
|
mke2fs \
|
|
|
|
|
sload_f2fs \
|
|
|
|
|
make_f2fs \
|
|
|
|
|
|
|
|
|
|
PRODUCT_HOST_PACKAGES += \
|
2019-07-05 18:33:05 +02:00
|
|
|
icu-data_host_i18n_apex
|
2019-02-23 00:06:03 +01:00
|
|
|
|
2018-06-26 12:20:34 +02:00
|
|
|
# Base modules and settings for the vendor partition.
|
|
|
|
|
PRODUCT_PACKAGES += \
|
2019-02-05 02:16:19 +01:00
|
|
|
android.hardware.cas@1.1-service \
|
2019-02-22 04:04:53 +01:00
|
|
|
android.hardware.configstore@1.1-service \
|
2018-06-26 12:20:34 +02:00
|
|
|
android.hardware.media.omx@1.0-service \
|
2019-09-26 16:59:41 +02:00
|
|
|
boringssl_self_test_vendor \
|
2019-01-26 04:15:20 +01:00
|
|
|
dumpsys_vendor \
|
2018-06-26 15:03:38 +02:00
|
|
|
fs_config_files_nonsystem \
|
|
|
|
|
fs_config_dirs_nonsystem \
|
2018-06-26 12:20:34 +02:00
|
|
|
gralloc.default \
|
2019-07-12 00:31:36 +02:00
|
|
|
group_odm \
|
2019-08-21 17:15:46 +02:00
|
|
|
group_system_ext \
|
2019-07-12 00:31:36 +02:00
|
|
|
group_vendor \
|
2018-10-16 02:48:42 +02:00
|
|
|
init_vendor \
|
2018-06-26 12:20:34 +02:00
|
|
|
libbundlewrapper \
|
|
|
|
|
libclearkeycasplugin \
|
|
|
|
|
libdownmix \
|
2018-07-03 13:37:33 +02:00
|
|
|
libdrmclearkeyplugin \
|
|
|
|
|
libdynproc \
|
2018-06-26 12:20:34 +02:00
|
|
|
libeffectproxy \
|
|
|
|
|
libeffects \
|
|
|
|
|
libldnhncr \
|
|
|
|
|
libreference-ril \
|
|
|
|
|
libreverbwrapper \
|
|
|
|
|
libril \
|
|
|
|
|
libvisualizer \
|
2019-07-12 00:31:36 +02:00
|
|
|
passwd_odm \
|
2019-08-21 17:15:46 +02:00
|
|
|
passwd_system_ext \
|
2019-07-12 00:31:36 +02:00
|
|
|
passwd_vendor \
|
2018-07-02 15:36:28 +02:00
|
|
|
selinux_policy_nonsystem \
|
2018-06-26 12:20:34 +02:00
|
|
|
shell_and_utilities_vendor \
|
|
|
|
|
vndservice \
|
2018-07-12 20:20:59 +02:00
|
|
|
vndservicemanager \
|
2018-07-11 01:43:19 +02:00
|
|
|
|
|
|
|
|
# VINTF data for vendor image
|
|
|
|
|
PRODUCT_PACKAGES += \
|
|
|
|
|
device_compatibility_matrix.xml \
|
Moving recovery resources from /system to /vendor
This change is part of a topic that moves the recovery resources from the
system partition to the vendor partition, if it exists, or the vendor directory
on the system partition otherwise. The recovery resources are moving from the
system image to the vendor partition so that a single system image may be used
with either an A/B or a non-A/B vendor image. The topic removes a delta in the
system image that prevented such reuse in the past.
The recovery resources that are moving are involved with updating the recovery
partition after an update. In a non-A/B configuration, the system boots from
the recovery partition, updates the other partitions (system, vendor, etc.)
Then, the next time the system boots normally, a script updates the recovery
partition (if necessary). This script, the executables it invokes, and the data
files that it uses were previously on the system partition. The resources that
are moving include the following.
* install-recovery.sh
* applypatch
* recovery-resource.dat (if present)
* recovery-from-boot.p (if present)
This change includes the platform build system and release tools changes to
move the recovery resources from system to vendor (or /system/vendor). The
release tools need to know where to generate the recovery patch, and they
discover this from misc_info.txt variable board_uses_vendorimage, which the
platform build system generates.
We remove applypatch from PRODUCT_PACKAGES, but it is added back as a required
module in target/product/base_vendor.mk.
Several release tools rely on the misc_info.txt board_uses_vendorimage variable
to know how to generate and detect the recovery patch.
This change partially removes the --rebuild_recovery flag from the
merge_target_files.py script. The flag will be fully removed in a follow-on
change.
Bug: 68319577
Test: Ensure that recovery partition is updated correctly.
Change-Id: Ia4045bd67ffb3d899efa8d20dab4c4299b87ee5f
2019-09-18 02:06:47 +02:00
|
|
|
|
|
|
|
|
# Packages to update the recovery partition, which will be installed on
|
|
|
|
|
# /vendor. TODO(b/141648565): Don't install these unless they're needed.
|
|
|
|
|
PRODUCT_PACKAGES += \
|
|
|
|
|
applypatch
|
