From fec295124fa1b3b593ce91d06063f3b960cb5adf Mon Sep 17 00:00:00 2001 From: chen Date: Sun, 25 Jun 2023 15:21:33 +0800 Subject: [PATCH] fix:Componentization hiviewdfx_hilog_native >> hilog Signed-off-by: chenpan0560 --- bundle.json | 55 +++++++++---------- common/BUILD.gn | 2 +- common/test/unittest/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 2 +- .../screentransport/screensinktrans/BUILD.gn | 2 +- .../screensourcetrans/BUILD.gn | 2 +- 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/bundle.json b/bundle.json index ef4881fe..73997414 100644 --- a/bundle.json +++ b/bundle.json @@ -1,37 +1,37 @@ { - "name":"@ohos/distributed_screen", - "description":"distributed hardware screen", - "version":"3.1", - "author":{}, - "repository":"https://gitee.com/openharmony/distributedhardware_distributed_screen", - "license":"Apache License 2.0", - "publishAs":"code-segment", - "segment":{ - "destPath":"foundation/distributedhardware/distributed_screen" + "name": "@ohos/distributed_screen", + "description": "distributed hardware screen", + "version": "3.1", + "author": {}, + "repository": "https://gitee.com/openharmony/distributedhardware_distributed_screen", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "foundation/distributedhardware/distributed_screen" }, - "dirs":{}, - "scripts":{}, - "component":{ - "name":"distributed_screen", - "subsystem":"distributedhardware", - "syscap":[ + "dirs": {}, + "scripts": {}, + "component": { + "name": "distributed_screen", + "subsystem": "distributedhardware", + "syscap": [ "SystemCapability.DistributedHardware.DistributedScreen" ], - "features":[], - "adapted_system_type":[ + "features": [], + "adapted_system_type": [ "standard" ], - "rom":"5120KB", - "ram":"33580KB", + "rom": "5120KB", + "ram": "33580KB", "hisysevent_config": [ "//foundation/distributedhardware/distributed_screen/hisysevent.yaml" ], - "deps":{ - "components":[ + "deps": { + "components": [ "dsoftbus", "hisysevent_native", "ipc", - "hiviewdfx_hilog_native", + "hilog", "input", "graphic_standard", "samgr", @@ -43,13 +43,13 @@ "multimedia_image_framework", "distributed_hardware_fwk" ], - "third_party":[ + "third_party": [ "json", "libjpeg_turbo" ] }, - "build":{ - "sub_component":[ + "build": { + "sub_component": [ "//foundation/distributedhardware/distributed_screen/common:distributed_screen_utils", "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", @@ -62,8 +62,7 @@ "//foundation/distributedhardware/distributed_screen/sa_profile:dscreen_sa_profile", "//foundation/distributedhardware/distributed_screen/sa_profile:dscreen.cfg" ], - "inner_kits":[ - { + "inner_kits": [{ "type": "so", "name": "//foundation/distributedhardware/distributed_screen/interfaces/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", "header": { @@ -84,7 +83,7 @@ } } ], - "test":[ + "test": [ "//foundation/distributedhardware/distributed_screen/services/screendemo:distributedScreenTest", "//foundation/distributedhardware/distributed_screen/common/test/unittest:ScreenCommonTest", "//foundation/distributedhardware/distributed_screen/screenhandler/test/unittest/screenhandler:DscreenHandlerTest", diff --git a/common/BUILD.gn b/common/BUILD.gn index 43dc9531..e9fafd8e 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -36,9 +36,9 @@ ohos_shared_library("distributed_screen_utils") { "c_utils:utilsbase", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", + "hilog:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/common/test/unittest/BUILD.gn b/common/test/unittest/BUILD.gn index 9e53608c..bf2bab34 100644 --- a/common/test/unittest/BUILD.gn +++ b/common/test/unittest/BUILD.gn @@ -49,8 +49,8 @@ ohos_unittest("ScreenCommonTest") { external_deps = [ "c_utils:utils", "dsoftbus:softbus_client", + "hilog:libhilog", "hisysevent_native:libhisysevent", - "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] } diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 4ff1efd1..3ba81ec0 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -53,7 +53,7 @@ ohos_executable("distributedScreenTest") { "dsoftbus:softbus_client", "graphic_standard:librender_service_client", "graphic_standard:surface", - "hiviewdfx_hilog_native:libhilog", + "hilog:libhilog", "player_framework:media_client", "samgr:samgr_proxy", "window_manager:libdm", diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 2182c769..c6b59a4a 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -77,9 +77,9 @@ ohos_shared_library("distributed_screen_sinktrans") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "graphic_standard:surface", + "hilog:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", ] diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index cb76f770..bde09a00 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -77,9 +77,9 @@ ohos_shared_library("distributed_screen_sourcetrans") { "dsoftbus:softbus_client", "graphic_standard:surface", "graphic_standard:sync_fence", + "hilog:libhilog", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", "player_framework:media_client", ] -- Gitee