diff --git a/niobeu4/liteos_m/config.gni b/niobeu4/liteos_m/config.gni index c133204..9c9b70e 100644 --- a/niobeu4/liteos_m/config.gni +++ b/niobeu4/liteos_m/config.gni @@ -17,12 +17,11 @@ kernel_type = "liteos_m" # Kernel version. kernel_version = "3.0.0" - # Board arch, e.g. "armv7-a", "rv32imac". board_arch = "" -board="esp32u4" -board_cpu="" +board = "esp32u4" +board_cpu = "" # Toolchain name used for system compiling. # E.g. gcc-arm-none-eabi, arm-linux-harmonyeabi-gcc, ohos-clang, riscv32-unknown-elf. @@ -70,8 +69,8 @@ board_cxx_flags = board_cflags board_ld_flags = [] # Board related headfiles search path. -board_include_dirs = [ - "//utils/native/lite/include", +board_include_dirs = [ + "//commonlibrary/utils_lite/include", "//device/soc/esp/esp32/components/osal/include", "//device/soc/esp/esp32/components/osal/port/xtensa/include", ] diff --git a/niobeu4/liteos_m/hals/log/BUILD.gn b/niobeu4/liteos_m/hals/log/BUILD.gn index 341283a..e5d49e5 100644 --- a/niobeu4/liteos_m/hals/log/BUILD.gn +++ b/niobeu4/liteos_m/hals/log/BUILD.gn @@ -15,16 +15,14 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { - sources = [ - "log.c", - ] + sources = [ "log.c" ] } -config("public"){ +config("public") { include_dirs = [ "//base/hiviewdfx/hiview_lite", "//base/hiviewdfx/hilog_lite/frameworks/mini", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr" + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", ] -} \ No newline at end of file +} diff --git a/niobeu4/liteos_m/hals/memory/BUILD.gn b/niobeu4/liteos_m/hals/memory/BUILD.gn index 6708e8c..5500cf1 100644 --- a/niobeu4/liteos_m/hals/memory/BUILD.gn +++ b/niobeu4/liteos_m/hals/memory/BUILD.gn @@ -15,13 +15,9 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { - sources = [ - "ohos_mem_pool.c", - ] + sources = [ "ohos_mem_pool.c" ] } -config("public"){ - include_dirs = [ - "//utils/native/lite/memory/include", - ] -} \ No newline at end of file +config("public") { + include_dirs = [ "//commonlibrary/utils_lite/memory/include" ] +} diff --git a/niobeu4/liteos_m/hals/syscalls/BUILD.gn b/niobeu4/liteos_m/hals/syscalls/BUILD.gn index d067add..e77a6d6 100644 --- a/niobeu4/liteos_m/hals/syscalls/BUILD.gn +++ b/niobeu4/liteos_m/hals/syscalls/BUILD.gn @@ -15,14 +15,12 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { - sources = [ - "syscalls.c", - ] - include_dirs = [ - "//utils/native/lite/memory/include", + sources = [ "syscalls.c" ] + include_dirs = [ + "//commonlibrary/utils_lite/memory/include", "//base/hiviewdfx/hiview_lite", "//base/hiviewdfx/hilog_lite/frameworks/mini", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", - "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr" + "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr", ] -} \ No newline at end of file +} diff --git a/niobeu4/liteos_m/hals/utils/file/BUILD.gn b/niobeu4/liteos_m/hals/utils/file/BUILD.gn index cb38eb4..2205454 100755 --- a/niobeu4/liteos_m/hals/utils/file/BUILD.gn +++ b/niobeu4/liteos_m/hals/utils/file/BUILD.gn @@ -1,22 +1,20 @@ -# Copyright (c) 2022 Hunan OpenValley Digital Industry Development Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# Copyright (c) 2022 Hunan OpenValley Digital Industry Development Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. - -static_library("hal_file_static") { - sources = [ - "hal_file.c", - ] - include_dirs = [ - "//utils/native/lite/hals/file", - "//utils/native/lite/include" - ] -} + +static_library("hal_file_static") { + sources = [ "hal_file.c" ] + include_dirs = [ + "//commonlibrary/utils_lite/hals/file", + "//commonlibrary/utils_lite/include", + ] +}