diff options
| author | Isaac J. Manjarres <isaacmanjarres@google.com> | 2024-02-05 11:14:38 -0800 |
|---|---|---|
| committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-07 11:55:16 +0000 |
| commit | 3bfcca35cd5542946c7956103a7f8ead7c70f328 (patch) | |
| tree | e70f3975b1b8183f595eda993fe34868717c0dd8 | |
| parent | 7f72413fa45ef9055544fcf084dcd26a969ea736 (diff) | |
| download | build-android-gs-shusky-5.15-android14-qpr2.tar.gz | |
build_utils.sh: Ignore MODULES_[RECOVERY|CHARGER]_LIST for system_dlkmandroid-14.0.0_r0.67android-gs-shusky-5.15-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
Change-Id: I50fb42b40a94b0b53d5a2cda676d39b919395538
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
(cherry picked from commit 4daab96c0623f571c0eefbb0a4fe2d955e86fdea)
| -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 2c66212..cdf7c85 100644 --- a/build_utils.sh +++ b/build_utils.sh @@ -312,9 +312,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 |