diff options
| author | Yifan Hong <elsk@google.com> | 2024-05-03 22:54:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-03 22:54:53 +0000 |
| commit | c91823cf2e561e6eea045f208473e87a97087d03 (patch) | |
| tree | 196ff61ef0349cf026577aecfd30190667315aad | |
| parent | ed886b27837d987dcc3af065e60762036c19cead (diff) | |
| parent | bee133eb94bba78d6ed8f19131943493fcf81df6 (diff) | |
| download | virtual-device-android-mainline.tar.gz | |
Merge "kleaf: use defconfig_fragment for ddk_test." into android-mainlineandroid-mainline
| -rw-r--r-- | kleaf_test/build.config.kleaf_test | 6 | ||||
| -rw-r--r-- | kleaf_test/kleaf_test.bzl | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/kleaf_test/build.config.kleaf_test b/kleaf_test/build.config.kleaf_test index 17747fb..5550dea 100644 --- a/kleaf_test/build.config.kleaf_test +++ b/kleaf_test/build.config.kleaf_test @@ -3,9 +3,3 @@ KERNEL_DIR=common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki . ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64 - -DEFCONFIG=kleaf_tests_gki_defconfig -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/kleaf_test/kleaf_test.fragment" -POST_DEFCONFIG_CMDS="" - -FILES="" diff --git a/kleaf_test/kleaf_test.bzl b/kleaf_test/kleaf_test.bzl index e55b89a..b93af6d 100644 --- a/kleaf_test/kleaf_test.bzl +++ b/kleaf_test/kleaf_test.bzl @@ -29,6 +29,8 @@ def kleaf_test( arch = "x86_64", srcs = [ "//common:kernel_x86_64_sources", + ], + defconfig_fragments = [ "kleaf_test.fragment", ], kconfig_ext = "Kconfig.ext", |