summaryrefslogtreecommitdiff
path: root/build.config.server.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'build.config.server.x86_64')
-rw-r--r--build.config.server.x86_641
1 files changed, 1 insertions, 0 deletions
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 && \