From f0b4175b9f53d5f61f0a219234b7c87d9a418a8b Mon Sep 17 00:00:00 2001 From: chen Date: Sun, 25 Jun 2023 15:19:09 +0800 Subject: [PATCH] fix:Componentization hiviewdfx_hilog_native >> hilog Signed-off-by: chenpan0560 --- bundle.json | 72 +++++++++++----------- dfx_utils/BUILD.gn | 2 +- dfx_utils/test/BUILD.gn | 2 +- dfx_utils/test/dfxtest/BUILD.gn | 2 +- inputdevicehandler/test/BUILD.gn | 2 +- interfaces/ipc/test/BUILD.gn | 6 +- services/sink/inputcollector/test/BUILD.gn | 2 +- utils/BUILD.gn | 2 +- utils/test/unittest/BUILD.gn | 2 +- 9 files changed, 45 insertions(+), 47 deletions(-) diff --git a/bundle.json b/bundle.json index 3596472..4f7e8e9 100755 --- a/bundle.json +++ b/bundle.json @@ -1,36 +1,36 @@ { - "name":"@ohos/distributed_input", - "description":"distributed hardware input", - "version":"3.2", - "author":{}, - "repository":"https://gitee.com/openharmony/distributedhardware_distributed_input", - "license":"Apache License 2.0", - "publishAs":"code-segment", - "segment":{ - "destPath":"foundation/distributedhardware/distributed_input" + "name": "@ohos/distributed_input", + "description": "distributed hardware input", + "version": "3.2", + "author": {}, + "repository": "https://gitee.com/openharmony/distributedhardware_distributed_input", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "foundation/distributedhardware/distributed_input" }, - "dirs":{}, - "scripts":{}, - "component":{ - "name":"distributed_input", - "subsystem":"distributedhardware", - "syscap":[ + "dirs": {}, + "scripts": {}, + "component": { + "name": "distributed_input", + "subsystem": "distributedhardware", + "syscap": [ "SystemCapability.DistributedHardware.DistributedInput" ], - "features":[], - "adapted_system_type":[ + "features": [], + "adapted_system_type": [ "standard" ], - "rom":"16384KB", - "ram":"15360KB", + "rom": "16384KB", + "ram": "15360KB", "hisysevent_config": [ "//foundation/distributedhardware/distributed_input/hisysevent.yaml" ], - "deps":{ - "components":[ + "deps": { + "components": [ "appexecfwk_standard", "eventhandler", - "hiviewdfx_hilog_native", + "hilog", "ipc", "safwk", "samgr", @@ -43,7 +43,7 @@ "graphic_standard", "window_manager" ], - "third_party":[ + "third_party": [ "jsoncpp", "googletest", "libcrypto_shared", @@ -51,8 +51,8 @@ "openssl" ] }, - "build":{ - "sub_component":[ + "build": { + "sub_component": [ "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", "//foundation/distributedhardware/distributed_input/sa_profile:distributed_input_source_sa_profile", "//foundation/distributedhardware/distributed_input/sa_profile:distributed_input_sink_sa_profile", @@ -70,19 +70,17 @@ "//foundation/distributedhardware/distributed_input/dfx_utils:libdinput_dfx_utils", "//foundation/distributedhardware/distributed_input/utils:libdinput_utils" ], - "inner_kits":[ - { - "type": "so", - "name": "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", - "header": { - "header_base": "//foundation/distributedhardware/distributed_input/interfaces/inner_kits/include", - "header_files": [ - "distributed_input_kit.h" - ] - } + "inner_kits": [{ + "type": "so", + "name": "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", + "header": { + "header_base": "//foundation/distributedhardware/distributed_input/interfaces/inner_kits/include", + "header_files": [ + "distributed_input_kit.h" + ] } - ], - "test":[ + }], + "test": [ "//foundation/distributedhardware/distributed_input/interfaces/inner_kits/test:test", "//foundation/distributedhardware/distributed_input/sourcehandler/test:test", "//foundation/distributedhardware/distributed_input/sinkhandler/test:test", diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 9d82262..dcc0bee 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -43,8 +43,8 @@ ohos_shared_library("libdinput_dfx_utils") { external_deps = [ "c_utils:utils", + "hilog:libhilog", "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/dfx_utils/test/BUILD.gn b/dfx_utils/test/BUILD.gn index af7b3aa..baa964c 100644 --- a/dfx_utils/test/BUILD.gn +++ b/dfx_utils/test/BUILD.gn @@ -15,4 +15,4 @@ group("test") { testonly = true deps = [ "dfxtest:dfxtest" ] -} \ No newline at end of file +} diff --git a/dfx_utils/test/dfxtest/BUILD.gn b/dfx_utils/test/dfxtest/BUILD.gn index fef1cd9..d6df3f3 100644 --- a/dfx_utils/test/dfxtest/BUILD.gn +++ b/dfx_utils/test/dfxtest/BUILD.gn @@ -64,8 +64,8 @@ ohos_unittest("distributed_input_dfx_test") { external_deps = [ "c_utils:utils", + "hilog:libhilog", "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/inputdevicehandler/test/BUILD.gn b/inputdevicehandler/test/BUILD.gn index 8fb7623..f10514b 100644 --- a/inputdevicehandler/test/BUILD.gn +++ b/inputdevicehandler/test/BUILD.gn @@ -15,4 +15,4 @@ group("test") { testonly = true deps = [ "inputhandlertest:inputhandlertest" ] -} \ No newline at end of file +} diff --git a/interfaces/ipc/test/BUILD.gn b/interfaces/ipc/test/BUILD.gn index 4989524..cea0eb0 100644 --- a/interfaces/ipc/test/BUILD.gn +++ b/interfaces/ipc/test/BUILD.gn @@ -15,12 +15,12 @@ group("test") { testonly = true deps = [ - "ipcunittest:ipcunittest", "addwhitelistinfoscallbackunittest:addwhitelistinfoscallbackunittest", + "clientunittest:clientunittest", "delwhitelistinfoscallbackunittest:delwhitelistinfoscallbackunittest", + "dinputsourcecallbackunittest:dinputsourcecallbackunittest", + "ipcunittest:ipcunittest", "unpreparedinputcallbackunittest:unpreparedinputcallbackunittest", "unregisterdinputcallbackunittest:unregisterdinputcallbackunittest", - "clientunittest:clientunittest", - "dinputsourcecallbackunittest:dinputsourcecallbackunittest", ] } diff --git a/services/sink/inputcollector/test/BUILD.gn b/services/sink/inputcollector/test/BUILD.gn index d034b6a..78bc7f0 100644 --- a/services/sink/inputcollector/test/BUILD.gn +++ b/services/sink/inputcollector/test/BUILD.gn @@ -15,4 +15,4 @@ group("test") { testonly = true deps = [ "sinkcollectorunittest:sinkcollectorunittest" ] -} \ No newline at end of file +} diff --git a/utils/BUILD.gn b/utils/BUILD.gn index e51dabb..f77494a 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -49,8 +49,8 @@ ohos_shared_library("libdinput_utils") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", + "hilog:libhilog", "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 983c60b..ed6dd5a 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -73,8 +73,8 @@ ohos_unittest("distributed_input_utils_test") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", + "hilog:libhilog", "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] -- Gitee