From 76dda7384e1dec268a5d80d3f10ee708ab22f4f9 Mon Sep 17 00:00:00 2001 From: xianghengliang Date: Sat, 12 Feb 2022 16:48:42 +0800 Subject: [PATCH 1/2] print log distinguished daemon and service Signed-off-by: xianghengliang --- services/BUILD.gn | 2 +- services/distributedfiledaemon/BUILD.gn | 5 +++++ services/distributedfileservice/BUILD.gn | 6 +++++- utils/BUILD.gn | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index f9b13805e..7603b1113 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -33,4 +33,4 @@ ohos_prebuilt_etc("distributed_file.para") { source = "distributed_file.para" part_name = "dfs_service" module_install_dir = "etc/param" -} +} \ No newline at end of file diff --git a/services/distributedfiledaemon/BUILD.gn b/services/distributedfiledaemon/BUILD.gn index 9eb3e4237..4e0379c2a 100755 --- a/services/distributedfiledaemon/BUILD.gn +++ b/services/distributedfiledaemon/BUILD.gn @@ -52,6 +52,11 @@ ohos_shared_library("libdistributedfiledaemon") { ] configs = [ "${utils_path}:compiler_configs" ] + defines = [ + "LOG_TAG=\"distributedfile_daemon\"", + ] + + part_name = "dfs_service" subsystem_name = "filemanagement" } diff --git a/services/distributedfileservice/BUILD.gn b/services/distributedfileservice/BUILD.gn index a98b9383f..03373a497 100644 --- a/services/distributedfileservice/BUILD.gn +++ b/services/distributedfileservice/BUILD.gn @@ -29,7 +29,11 @@ ohos_shared_library("libdistributedfileservice") { "src/network/softbus_dispatcher.cpp", ] - configs = [ "${utils_path}:compiler_configs" ] + configs = [ "${utils_path}:compiler_configs"] + + defines = [ + "LOG_TAG=\"distributedfile_service\"", + ] external_deps = [ "dsoftbus_standard:softbus_client", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index f5169272e..8ce6bc6df 100755 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -36,7 +36,6 @@ config("compiler_configs") { ] defines = [ - "LOG_TAG=\"distributedfile\"", "LOG_DOMAIN=0xD001600", "LOG_LEVEL=INFO", ] -- Gitee From a3014bc32c55005b8d890a93752797f9e913bd91 Mon Sep 17 00:00:00 2001 From: xianghengliang Date: Sat, 12 Feb 2022 17:23:47 +0800 Subject: [PATCH 2/2] format gn fix Signed-off-by: xianghengliang --- services/BUILD.gn | 2 +- services/distributedfiledaemon/BUILD.gn | 5 +---- services/distributedfileservice/BUILD.gn | 6 ++---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index 7603b1113..f9b13805e 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -33,4 +33,4 @@ ohos_prebuilt_etc("distributed_file.para") { source = "distributed_file.para" part_name = "dfs_service" module_install_dir = "etc/param" -} \ No newline at end of file +} diff --git a/services/distributedfiledaemon/BUILD.gn b/services/distributedfiledaemon/BUILD.gn index 4e0379c2a..798fc595c 100755 --- a/services/distributedfiledaemon/BUILD.gn +++ b/services/distributedfiledaemon/BUILD.gn @@ -52,10 +52,7 @@ ohos_shared_library("libdistributedfiledaemon") { ] configs = [ "${utils_path}:compiler_configs" ] - defines = [ - "LOG_TAG=\"distributedfile_daemon\"", - ] - + defines = [ "LOG_TAG=\"distributedfile_daemon\"" ] part_name = "dfs_service" subsystem_name = "filemanagement" diff --git a/services/distributedfileservice/BUILD.gn b/services/distributedfileservice/BUILD.gn index 03373a497..a56689479 100644 --- a/services/distributedfileservice/BUILD.gn +++ b/services/distributedfileservice/BUILD.gn @@ -29,11 +29,9 @@ ohos_shared_library("libdistributedfileservice") { "src/network/softbus_dispatcher.cpp", ] - configs = [ "${utils_path}:compiler_configs"] + configs = [ "${utils_path}:compiler_configs" ] - defines = [ - "LOG_TAG=\"distributedfile_service\"", - ] + defines = [ "LOG_TAG=\"distributedfile_service\"" ] external_deps = [ "dsoftbus_standard:softbus_client", -- Gitee