From bc65dc372ff9e4c33eff42ae42a7022d9c25b204 Mon Sep 17 00:00:00 2001 From: HONG Yifan Date: Thu, 12 Sep 2024 17:28:46 -0700 Subject: [PATCH] ANDROID: Error to use GKI_BUILD_CONFIG_FRAGMENT. Kleaf has introduced --gki_build_config_fragment for quite a while to replace GKI_BUILD_CONFIG_FRAGMENT. Make it an error to use the legacy GKI_BUILD_CONFIG_FRAGMENT. Bug: 236012223 Change-Id: I27d31c489d0271d7fba922e116cd1f8e6eece801 Signed-off-by: HONG Yifan --- build.config.gki.aarch64 | 3 ++- build.config.gki.x86_64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 337ea8aaace1..3069101736a6 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -3,5 +3,6 @@ . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then -source ${GKI_BUILD_CONFIG_FRAGMENT} + echo "ERROR: GKI_BUILD_CONFIG_FRAGMENT is deprecated; use --gki_build_config_fragment instead.">&2 + exit 1 fi diff --git a/build.config.gki.x86_64 b/build.config.gki.x86_64 index 6d6a98dc28be..d679a20eff43 100644 --- a/build.config.gki.x86_64 +++ b/build.config.gki.x86_64 @@ -3,5 +3,6 @@ . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki if [ -n "${GKI_BUILD_CONFIG_FRAGMENT}" ]; then -source ${GKI_BUILD_CONFIG_FRAGMENT} + echo "ERROR: GKI_BUILD_CONFIG_FRAGMENT is deprecated; use --gki_build_config_fragment instead.">&2 + exit 1 fi