From b0aa12334daa7bf14421b2c6b1ecf6edffa135a0 Mon Sep 17 00:00:00 2001 From: lockzhiner_wang-xiaobin Date: Thu, 25 Aug 2022 14:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lockzhiner_wang-xiaobin --- BUILD.gn | 14 ++++++-------- lingpi/BUILD.gn | 4 ++-- lingpi/liteos_m/BUILD.gn | 2 +- lingpi/third_party/BUILD.gn | 4 +--- lingpi/third_party/rk2206_lwip/BUILD.gn | 9 +++++---- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 02a6126..f233384 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -12,11 +12,9 @@ # limitations under the License. if (ohos_kernel_type == "liteos_m") { - import("//kernel/liteos_m/liteos.gni") - module_name = get_path_info(rebase_path("."), "name") - module_group(module_name) { - modules = [ - "lingpi", - ] - } -} \ No newline at end of file + import("//kernel/liteos_m/liteos.gni") + module_name = get_path_info(rebase_path("."), "name") + module_group(module_name) { + modules = [ "lingpi" ] + } +} diff --git a/lingpi/BUILD.gn b/lingpi/BUILD.gn index 7fb8476..8439c8c 100755 --- a/lingpi/BUILD.gn +++ b/lingpi/BUILD.gn @@ -15,10 +15,10 @@ if (ohos_kernel_type == "liteos_m") { import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") module_group(module_name) { - modules = [ + modules = [ "liteos_m", "third_party", "//vendor/lockzhiner/lingpi/samples", ] } -} \ No newline at end of file +} diff --git a/lingpi/liteos_m/BUILD.gn b/lingpi/liteos_m/BUILD.gn index 23e669d..88493de 100755 --- a/lingpi/liteos_m/BUILD.gn +++ b/lingpi/liteos_m/BUILD.gn @@ -15,4 +15,4 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { -} \ No newline at end of file +} diff --git a/lingpi/third_party/BUILD.gn b/lingpi/third_party/BUILD.gn index 29fa8ae..f56789b 100755 --- a/lingpi/third_party/BUILD.gn +++ b/lingpi/third_party/BUILD.gn @@ -14,7 +14,5 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") module_group(module_name) { - modules = [ - "rk2206_lwip", - ] + modules = [ "rk2206_lwip" ] } diff --git a/lingpi/third_party/rk2206_lwip/BUILD.gn b/lingpi/third_party/rk2206_lwip/BUILD.gn index 139e233..f961c3e 100755 --- a/lingpi/third_party/rk2206_lwip/BUILD.gn +++ b/lingpi/third_party/rk2206_lwip/BUILD.gn @@ -15,11 +15,12 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/lite_subsystem.gni") config("public") { - include_dirs = [ "." ] + include_dirs = [ "." ] } build_ext_component("rk2206_lwip") { - exec_path = rebase_path(".", root_build_dir) - outdir = rebase_path("//kernel/liteos_m/components/net/lwip-2.1/porting/include/lwip/") - command = "sh ./build.sh $outdir" + exec_path = rebase_path(".", root_build_dir) + outdir = rebase_path( + "//kernel/liteos_m/components/net/lwip-2.1/porting/include/lwip/") + command = "sh ./build.sh $outdir" }