!490 内核的配置文件改为放到kernel_configs目录下
Merge pull request !490 from Caoruihong/kernel_configs
This commit is contained in:
commit
d169cad6b4
2
BUILD.gn
2
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
|
||||
}
|
||||
|
|
4
Makefile
4
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)
|
||||
|
|
Loading…
Reference in New Issue