diff options
| author | Isaac J. Manjarres <isaacmanjarres@google.com> | 2024-02-05 11:14:38 -0800 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-02-06 01:43:56 +0000 |
| commit | 3288d7ac659694818a76e0208383f9a78fb74e65 (patch) | |
| tree | 199ab7a9e2570815020fc141fe7ca01974404b9e | |
| parent | 1c6564c20c7e534fd654a69aa785c0c2bba6f1ce (diff) | |
| download | build-android-gs-lynx-5.10-android15-dp.tar.gz | |
build_utils.sh: Ignore MODULES_[RECOVERY|CHARGER]_LIST for system_dlkmandroid-u-qpr3-beta-2.1_r0.7android-u-qpr3-beta-2.1_r0.5android-u-qpr3-beta-2.1_r0.4android-u-qpr3-beta-2.1_r0.3android-u-qpr3-beta-2.1_r0.2android-u-qpr3-beta-2.1_r0.1android-15-dp-2_r0.5android-15-dp-2_r0.4android-15-dp-2_r0.3android-15-dp-2_r0.2android-15-beta-1_r0.6android-15-beta-1_r0.5android-15-beta-1_r0.4android-15-beta-1_r0.3android-15-beta-1_r0.2android-15-beta-1_r0.1android-14.0.0_r0.66android-14.0.0_r0.65android-14.0.0_r0.64android-14.0.0_r0.63android-14.0.0_r0.62android-14.0.0_r0.61master-kernel-build-2022android-gs-tangorpro-5.10-android15-dpandroid-gs-tangorpro-5.10-android15-betaandroid-gs-tangorpro-5.10-android14-qpr3-betaandroid-gs-tangorpro-5.10-android14-qpr2android-gs-raviole-5.10-android15-dpandroid-gs-raviole-5.10-android15-betaandroid-gs-raviole-5.10-android14-qpr3-betaandroid-gs-raviole-5.10-android14-qpr2android-gs-pantah-5.10-android15-dpandroid-gs-pantah-5.10-android15-betaandroid-gs-pantah-5.10-android14-qpr3-betaandroid-gs-pantah-5.10-android14-qpr2android-gs-lynx-5.10-android15-dpandroid-gs-lynx-5.10-android15-betaandroid-gs-lynx-5.10-android14-qpr3-betaandroid-gs-lynx-5.10-android14-qpr2android-gs-felix-5.10-android15-dpandroid-gs-felix-5.10-android15-betaandroid-gs-felix-5.10-android14-qpr3-betaandroid-gs-felix-5.10-android14-qpr2android-gs-bluejay-5.10-android15-dpandroid-gs-bluejay-5.10-android15-betaandroid-gs-bluejay-5.10-android14-qpr3-betaandroid-gs-bluejay-5.10-android14-qpr2
The system_dlkm partition consists of GKI modules, which are not loaded
during first-stage init. However, the MODULES_[RECOVERY|CHARGER]_LIST
arguments specify vendor modules that must be loaded during first
stage init. Therefore, it does not make sense to consider these
lists when building system_dlkm.img, so do not consider them.
Bug: 322408856
Bug: 323710246
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:4daab96c0623f571c0eefbb0a4fe2d955e86fdea)
Merged-In: I50fb42b40a94b0b53d5a2cda676d39b919395538
Change-Id: I50fb42b40a94b0b53d5a2cda676d39b919395538
| -rw-r--r-- | build_utils.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build_utils.sh b/build_utils.sh index 3b48cbe..9866a34 100644 --- a/build_utils.sh +++ b/build_utils.sh @@ -299,9 +299,12 @@ function build_system_dlkm() { echo " Creating system_dlkm image" rm -rf ${SYSTEM_DLKM_STAGING_DIR} + # MODULES_[RECOVERY_LIST|CHARGER]_LIST should not influence system_dlkm, as + # GKI modules are not loaded when booting into either recovery or charger + # modes, so do not consider them, and pass empty strings instead. create_modules_staging "${SYSTEM_DLKM_MODULES_LIST:-${MODULES_LIST}}" "${MODULES_STAGING_DIR}" \ ${SYSTEM_DLKM_STAGING_DIR} "${SYSTEM_DLKM_MODULES_BLOCKLIST:-${MODULES_BLOCKLIST}}" \ - "${MODULES_RECOVERY_LIST:-""}" "${MODULES_CHARGER_LIST:-""}" "-e" + "" "" "-e" local system_dlkm_root_dir=$(echo ${SYSTEM_DLKM_STAGING_DIR}/lib/modules/*) cp ${system_dlkm_root_dir}/modules.load ${DIST_DIR}/system_dlkm.modules.load |