From 60ddbe2e7b0c01e8d1e7068edbc55c419b6ce273 Mon Sep 17 00:00:00 2001 From: zhong_ning Date: Thu, 12 Aug 2021 09:32:00 +0800 Subject: [PATCH] format BUILD.gn Signed-off-by: zhong_ning --- initsync/BUILD.gn | 12 ++---- interfaces/innerkits/reboot/BUILD.gn | 5 +-- interfaces/innerkits/socket/BUILD.gn | 5 +-- services/cmds/reboot/BUILD.gn | 54 ++++++++++++-------------- services/test/unittest/common/BUILD.gn | 6 +-- 5 files changed, 35 insertions(+), 47 deletions(-) diff --git a/initsync/BUILD.gn b/initsync/BUILD.gn index 2a2d1f26..773ee36c 100644 --- a/initsync/BUILD.gn +++ b/initsync/BUILD.gn @@ -18,9 +18,7 @@ lite_component("initsync") { } shared_library("libinitsync_shared") { - sources = [ - "src/init_sync.c", - ] + sources = [ "src/init_sync.c" ] cflags = [ "-Wall" ] include_dirs = [ "//base/startup/init_lite/initsync/include", @@ -34,16 +32,12 @@ shared_library("libinitsync_shared") { } static_library("libinitsync_static") { - sources = [ - "src/init_sync.c", - ] + sources = [ "src/init_sync.c" ] cflags = [ "-Wall" ] include_dirs = [ "//base/startup/init_lite/initsync/include", "//base/startup/init_lite/interfaces/kits", "//base/startup/init_lite/services/log", ] - public_deps = [ - "//third_party/bounds_checking_function:libsec_static", - ] + public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] } diff --git a/interfaces/innerkits/reboot/BUILD.gn b/interfaces/innerkits/reboot/BUILD.gn index e3bc6f0f..d603b712 100644 --- a/interfaces/innerkits/reboot/BUILD.gn +++ b/interfaces/innerkits/reboot/BUILD.gn @@ -13,9 +13,8 @@ import("//build/ohos.gni") ohos_static_library("libreboot") { - sources = [ - "//base/startup/init_lite/interfaces/innerkits/reboot/init_reboot.c", - ] + sources = + [ "//base/startup/init_lite/interfaces/innerkits/reboot/init_reboot.c" ] include_dirs = [ "//base/startup/init_lite/interfaces/innerkits/include", diff --git a/interfaces/innerkits/socket/BUILD.gn b/interfaces/innerkits/socket/BUILD.gn index 43cb71b5..0a95024a 100644 --- a/interfaces/innerkits/socket/BUILD.gn +++ b/interfaces/innerkits/socket/BUILD.gn @@ -13,9 +13,8 @@ import("//build/ohos.gni") ohos_static_library("libsocket") { - sources = [ - "//base/startup/init_lite/interfaces/innerkits/socket/init_socket.c", - ] + sources = + [ "//base/startup/init_lite/interfaces/innerkits/socket/init_socket.c" ] include_dirs = [ "//base/startup/init_lite/interfaces/innerkits/include", diff --git a/services/cmds/reboot/BUILD.gn b/services/cmds/reboot/BUILD.gn index 724a5cfc..d7bd52bc 100755 --- a/services/cmds/reboot/BUILD.gn +++ b/services/cmds/reboot/BUILD.gn @@ -1,30 +1,26 @@ -# Copyright (c) 2020 Huawei Device 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) 2020 Huawei Device 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. - -import("//build/ohos.gni") - -ohos_executable("reboot") { - sources = [ - "init_cmd_reboot.c", - ] - include_dirs = [ - "//base/startup/init_lite/interfaces/innerkits/include", - "//base/startup/init_lite/services/include/param/", - "//third_party/bounds_checking_function/include", - ] - deps = [ - "//base/startup/init_lite/interfaces/innerkits/reboot:libreboot", - ] - install_enable = true - part_name = "init" -} + +import("//build/ohos.gni") + +ohos_executable("reboot") { + sources = [ "init_cmd_reboot.c" ] + include_dirs = [ + "//base/startup/init_lite/interfaces/innerkits/include", + "//base/startup/init_lite/services/include/param/", + "//third_party/bounds_checking_function/include", + ] + deps = [ "//base/startup/init_lite/interfaces/innerkits/reboot:libreboot" ] + install_enable = true + part_name = "init" +} diff --git a/services/test/unittest/common/BUILD.gn b/services/test/unittest/common/BUILD.gn index 9b9c379e..066f0dd5 100644 --- a/services/test/unittest/common/BUILD.gn +++ b/services/test/unittest/common/BUILD.gn @@ -38,28 +38,28 @@ if (defined(ohos_lite)) { ] sources = [ + "//base/startup/init_lite/services/log/init_log.c", "//base/startup/init_lite/services/src/init_adapter.c", "//base/startup/init_lite/services/src/init_capability.c", "//base/startup/init_lite/services/src/init_cmds.c", "//base/startup/init_lite/services/src/init_import.c", "//base/startup/init_lite/services/src/init_jobs.c", "//base/startup/init_lite/services/src/init_read_cfg.c", + "//base/startup/init_lite/services/src/init_reboot.c", "//base/startup/init_lite/services/src/init_service.c", "//base/startup/init_lite/services/src/init_service_manager.c", "//base/startup/init_lite/services/src/init_service_socket.c", "//base/startup/init_lite/services/src/init_signal_handler.c", "//base/startup/init_lite/services/src/init_utils.c", - "//base/startup/init_lite/services/src/init_reboot.c", - "//base/startup/init_lite/services/log/init_log.c", "cmd_func_test.cpp", ] deps = [ + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/startup/init_lite/initsync:initsync", "//base/startup/syspara_lite/frameworks/parameter:parameter", "//build/lite/config/component/cJSON:cjson_shared", "//third_party/bounds_checking_function:libsec_shared", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", ] if (ohos_kernel_type == "liteos_a") { include_dirs += [ -- GitLab