diff options
author | Yifan Hong <elsk@google.com> | 2024-05-15 14:15:11 -0700 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2024-05-15 14:15:12 -0700 |
commit | 151e7bcef9024dd4c4c2b79053ac69db73fd1a1b (patch) | |
tree | 120347c61e1af68aa07d06253152c29fc8a31fa1 | |
parent | c91823cf2e561e6eea045f208473e87a97087d03 (diff) | |
download | virtual-device-android-mainline.tar.gz |
Fix server PRE_DEFCONFIG_CMDS.android-mainline
The change below introduced a bug that merge_config.sh
is not actually invoked. Add it back.
Fixes: 3037bd88b6eab76020d66182098c9ac22d88b702
("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 && \ |