diff --git a/BUILD.gn b/BUILD.gn index 4a038b261b961e89a89fb626d362637d01534b79..e3c2d3ce25168f4b31c023d9489dd1fbc45737d3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -63,7 +63,7 @@ if (ohos_build_compiler == "clang") { liteos_config_file = rebase_path("tools/build/config/$config_file") # we prefer use product specified config file -f = "$product_path/config/${ohos_build_type}${tee}.config" +f = "$product_path/kernel_configs/${ohos_build_type}${tee}.config" if (exec_script("//build/lite/run_shell_cmd.py", [ "if [ -f $f ]; then echo true; else echo false; fi" ], "value")) { liteos_config_file = f } diff --git a/Makefile b/Makefile index c0e14748699d74bac4e2f7eee7ff1179a9d06779..7d7d225f09fda573f24e2acfdfcb8d03f3b8ed8b 100644 --- a/Makefile +++ b/Makefile @@ -61,9 +61,9 @@ ifeq ($(TEE:1=y),y) tee = _tee endif ifeq ($(RELEASE:1=y),y) -CONFIG ?= $(PRODUCT_PATH)/config/release$(tee).config +CONFIG ?= $(PRODUCT_PATH)/kernel_configs/release$(tee).config else -CONFIG ?= $(PRODUCT_PATH)/config/debug$(tee).config +CONFIG ?= $(PRODUCT_PATH)/kernel_configs/debug$(tee).config endif $(shell env CONFIG_=$(CONFIG_) DEVICE_PATH=$(DEVICE_PATH) olddefconfig >/dev/null) diff --git a/build.sh b/build.sh index 16794d1307c25672be0f99f37898edd24966900e..79c21b74ce19778136e0fe4cc9d5cae1011f2832 100755 --- a/build.sh +++ b/build.sh @@ -53,7 +53,7 @@ function main() { tee="_tee" fi - config_file="${product_path}/config/${ohos_build_type}${tee}.config" + config_file="${product_path}/kernel_configs/${ohos_build_type}${tee}.config" if [ -f "${config_file}" ]; then cp "${config_file}" "${destination}" return