diff options
| author | Yifan Hong <elsk@google.com> | 2024-05-15 23:33:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-05-15 23:33:22 +0000 |
| commit | 906bb7e4fdb3c1bc7477a1cf7a6d1bd04f9c0871 (patch) | |
| tree | a5c274b4911415f39af42ee97f555cd314c47bd4 | |
| parent | 0ece4aae6c91a5ee594ad635bfab65578310163f (diff) | |
| parent | 151e7bcef9024dd4c4c2b79053ac69db73fd1a1b (diff) | |
| download | virtual-device-android-mainline-riscv64.tar.gz | |
Fix server PRE_DEFCONFIG_CMDS. am: 151e7bcef9android-mainline-riscv64
Original change: https://android-review.googlesource.com/c/kernel/common-modules/virtual-device/+/3090225
Change-Id: I051ffc1bedcc5ab4f2759795ab56c6dab248a937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 && \ |