diff options
| author | Yifan Hong <elsk@google.com> | 2024-05-15 14:15:11 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2024-05-15 21:18:16 +0000 |
| commit | 31d55ad282832dbc009bc3b17deed6537c6ac969 (patch) | |
| tree | 8bc2ff5d82b6fab7b4dcc11a2db3453db4f3eed8 | |
| parent | 41f61eaceb6feb8bc0a55e7e280c84b3d7394fba (diff) | |
| download | virtual-device-android14-6.1.tar.gz | |
Fix server PRE_DEFCONFIG_CMDS.android14-6.1
The change below introduced a bug that merge_config.sh
is not actually invoked. Add it back.
Fixes: 33d6e032bfbd696ea1a67f71173445d0bf7e77bc
("PRE_DEFCONFIG_CMDS does not write to source tree.")
Change-Id: I184344c507b6f3a75d02a3ab5cf31bff4315f141
| -rw-r--r-- | build.config.server.aarch64 | 1 | ||||
| -rw-r--r-- | build.config.server.x86_64 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build.config.server.aarch64 b/build.config.server.aarch64 index 866c34a..9776a0c 100644 --- a/build.config.server.aarch64 +++ b/build.config.server.aarch64 @@ -17,6 +17,7 @@ DEFCONFIG=vd_aarch64_gce_defconfig # See b/275468906#comment8 PRE_DEFCONFIG_CMDS="mkdir -p \${OUT_DIR}/arch/arm64/configs && \ KCONFIG_CONFIG=\${OUT_DIR}/arch/arm64/configs/${DEFCONFIG} \ + ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r \ ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig \ ${ROOT_DIR}/common-modules/virtual-device/virtual_device_core.fragment \ ${ROOT_DIR}/common-modules/virtual-device/linux_distro.fragment && \ diff --git a/build.config.server.x86_64 b/build.config.server.x86_64 index 3ed5f2d..5ddfd6a 100644 --- a/build.config.server.x86_64 +++ b/build.config.server.x86_64 @@ -17,6 +17,7 @@ DEFCONFIG=vd_x86_64_gce_defconfig # See b/275468906#comment8 PRE_DEFCONFIG_CMDS="mkdir -p \${OUT_DIR}/arch/x86/configs && \ KCONFIG_CONFIG=\${OUT_DIR}/arch/x86/configs/${DEFCONFIG} \ + ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r \ ${ROOT_DIR}/${KERNEL_DIR}/arch/x86/configs/gki_defconfig \ ${ROOT_DIR}/common-modules/virtual-device/virtual_device_core.fragment \ ${ROOT_DIR}/common-modules/virtual-device/linux_distro.fragment && \ |