From ff841b30d5dde9b603997fa0e226ea58ce5afa57 Mon Sep 17 00:00:00 2001 From: stesen Date: Fri, 16 Jul 2021 09:54:31 +0800 Subject: [PATCH 1/2] fix hilog part name https://gitee.com/openharmony/hiviewdfx_hilog/issues/I40V51 Signed-off-by: stesen Change-Id: Ice76b2f6c8266deef2eac4a84d7c8d9ecfb0f870 --- audio/hal/hdi_binder/proxy/src/BUILD.gn | 2 +- audio/hal/hdi_binder/server/src/BUILD.gn | 2 +- audio/hal/hdi_passthrough/src/BUILD.gn | 2 +- audio/hal/pathselect/src/BUILD.gn | 2 +- audio/sample/BUILD.gn | 4 ++-- audio/supportlibs/adm_adapter/src/BUILD.gn | 4 ++-- display/interfaces/hdi_cpp/client/BUILD.gn | 2 +- display/interfaces/hdi_cpp/server/BUILD.gn | 2 +- input/hal/BUILD.gn | 2 +- misc/vibrator/hal/BUILD.gn | 2 +- misc/vibrator/test/performance/BUILD.gn | 2 +- misc/vibrator/test/unittest/BUILD.gn | 2 +- sensor/hal/BUILD.gn | 2 +- sensor/test/unittest/BUILD.gn | 2 +- wlan/hal/BUILD.gn | 2 +- wlan/hdi_service/BUILD.gn | 2 +- wlan/test/hdi_service/BUILD.gn | 2 +- wlan/test/unittest/BUILD.gn | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/audio/hal/hdi_binder/proxy/src/BUILD.gn b/audio/hal/hdi_binder/proxy/src/BUILD.gn index d13c349cbd..d489f25f25 100755 --- a/audio/hal/hdi_binder/proxy/src/BUILD.gn +++ b/audio/hal/hdi_binder/proxy/src/BUILD.gn @@ -101,7 +101,7 @@ ohos_shared_library("audio_hdi_proxy_server") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/audio/hal/hdi_binder/server/src/BUILD.gn b/audio/hal/hdi_binder/server/src/BUILD.gn index e412aeb88f..be24e101f4 100755 --- a/audio/hal/hdi_binder/server/src/BUILD.gn +++ b/audio/hal/hdi_binder/server/src/BUILD.gn @@ -84,7 +84,7 @@ ohos_shared_library("audio_hdi_adapter_server") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/audio/hal/hdi_passthrough/src/BUILD.gn b/audio/hal/hdi_passthrough/src/BUILD.gn index da21ce1e24..d34b78797b 100755 --- a/audio/hal/hdi_passthrough/src/BUILD.gn +++ b/audio/hal/hdi_passthrough/src/BUILD.gn @@ -100,7 +100,7 @@ ohos_shared_library("hdi_audio") { } if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/audio/hal/pathselect/src/BUILD.gn b/audio/hal/pathselect/src/BUILD.gn index fef400147c..e6972af1e5 100755 --- a/audio/hal/pathselect/src/BUILD.gn +++ b/audio/hal/pathselect/src/BUILD.gn @@ -83,7 +83,7 @@ ohos_shared_library("hdi_audio_path_select") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/audio/sample/BUILD.gn b/audio/sample/BUILD.gn index 13ffbd9740..1ea6813406 100755 --- a/audio/sample/BUILD.gn +++ b/audio/sample/BUILD.gn @@ -62,7 +62,7 @@ ohos_executable("audio_sample_render") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } @@ -115,7 +115,7 @@ ohos_executable("audio_sample_capture") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/audio/supportlibs/adm_adapter/src/BUILD.gn b/audio/supportlibs/adm_adapter/src/BUILD.gn index bed981a7bd..4506b3c797 100755 --- a/audio/supportlibs/adm_adapter/src/BUILD.gn +++ b/audio/supportlibs/adm_adapter/src/BUILD.gn @@ -84,7 +84,7 @@ ohos_shared_library("hdi_audio_interface_lib_capture") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } @@ -130,7 +130,7 @@ ohos_shared_library("hdi_audio_interface_lib_render") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/display/interfaces/hdi_cpp/client/BUILD.gn b/display/interfaces/hdi_cpp/client/BUILD.gn index efedbf5838..bc70052bd4 100644 --- a/display/interfaces/hdi_cpp/client/BUILD.gn +++ b/display/interfaces/hdi_cpp/client/BUILD.gn @@ -39,7 +39,7 @@ if (is_standard_system) { if (is_standard_system) { external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "hilog_native:libhilog", "ipc:ipc_core", ] } else { diff --git a/display/interfaces/hdi_cpp/server/BUILD.gn b/display/interfaces/hdi_cpp/server/BUILD.gn index 961695d24d..ab3728a114 100644 --- a/display/interfaces/hdi_cpp/server/BUILD.gn +++ b/display/interfaces/hdi_cpp/server/BUILD.gn @@ -45,7 +45,7 @@ if (is_standard_system) { if (is_standard_system) { external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "hilog_native:libhilog", "ipc:ipc_core", ] } else { diff --git a/input/hal/BUILD.gn b/input/hal/BUILD.gn index b6e00a3d35..aca2536c52 100644 --- a/input/hal/BUILD.gn +++ b/input/hal/BUILD.gn @@ -101,7 +101,7 @@ if (defined(ohos_lite)) { subsystem_name = "hdf" if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/misc/vibrator/hal/BUILD.gn b/misc/vibrator/hal/BUILD.gn index 5f3af3e116..770e65b1ab 100644 --- a/misc/vibrator/hal/BUILD.gn +++ b/misc/vibrator/hal/BUILD.gn @@ -88,7 +88,7 @@ if (defined(ohos_lite)) { ] subsystem_name = "hdf" if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/misc/vibrator/test/performance/BUILD.gn b/misc/vibrator/test/performance/BUILD.gn index f08cb93908..0ab22d129c 100644 --- a/misc/vibrator/test/performance/BUILD.gn +++ b/misc/vibrator/test/performance/BUILD.gn @@ -75,7 +75,7 @@ if (defined(ohos_lite)) { "//utils/native/base:utils", ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/misc/vibrator/test/unittest/BUILD.gn b/misc/vibrator/test/unittest/BUILD.gn index b40e981196..fe710362e3 100644 --- a/misc/vibrator/test/unittest/BUILD.gn +++ b/misc/vibrator/test/unittest/BUILD.gn @@ -75,7 +75,7 @@ if (defined(ohos_lite)) { "//utils/native/base:utils", ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/sensor/hal/BUILD.gn b/sensor/hal/BUILD.gn index 4a6b7b6932..28fbef3af1 100644 --- a/sensor/hal/BUILD.gn +++ b/sensor/hal/BUILD.gn @@ -104,7 +104,7 @@ if (defined(ohos_lite)) { ] subsystem_name = "hdf" if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/sensor/test/unittest/BUILD.gn b/sensor/test/unittest/BUILD.gn index 25832be5c5..cdec21ad58 100644 --- a/sensor/test/unittest/BUILD.gn +++ b/sensor/test/unittest/BUILD.gn @@ -81,7 +81,7 @@ if (defined(ohos_lite)) { "//utils/native/base:utils", ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/wlan/hal/BUILD.gn b/wlan/hal/BUILD.gn index 10e3fb8376..11fa73568f 100755 --- a/wlan/hal/BUILD.gn +++ b/wlan/hal/BUILD.gn @@ -102,7 +102,7 @@ if (defined(ohos_lite)) { ] subsystem_name = "hdf" if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/wlan/hdi_service/BUILD.gn b/wlan/hdi_service/BUILD.gn index 4438ba7f74..f7d3d3adc2 100644 --- a/wlan/hdi_service/BUILD.gn +++ b/wlan/hdi_service/BUILD.gn @@ -65,7 +65,7 @@ ohos_shared_library("wifi_hdi_device") { subsystem_name = "hdf" if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/wlan/test/hdi_service/BUILD.gn b/wlan/test/hdi_service/BUILD.gn index c57c104250..c39e6f5b7c 100644 --- a/wlan/test/hdi_service/BUILD.gn +++ b/wlan/test/hdi_service/BUILD.gn @@ -58,7 +58,7 @@ ohos_unittest("WlanHdiServiceTest") { ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } diff --git a/wlan/test/unittest/BUILD.gn b/wlan/test/unittest/BUILD.gn index 6150d220ec..b8f93cafd5 100644 --- a/wlan/test/unittest/BUILD.gn +++ b/wlan/test/unittest/BUILD.gn @@ -103,7 +103,7 @@ if (defined(ohos_lite)) { "//utils/native/base:utils", ] if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } else { external_deps = [ "hilog:libhilog" ] } -- Gitee From f9853b40d4e533a63ddb60f7ca56776ca17268f1 Mon Sep 17 00:00:00 2001 From: stesen Date: Fri, 16 Jul 2021 10:36:10 +0800 Subject: [PATCH 2/2] fix hilog part name https://gitee.com/openharmony/hiviewdfx_hilog/issues/I40V51 Signed-off-by: stesen Change-Id: Iff8ed70bd3fce1e45cbb4ebe068df0c58a4cd3a1 --- audio/hal/hdi_binder/proxy/src/BUILD.gn | 14 +++++--------- audio/hal/hdi_binder/server/src/BUILD.gn | 8 ++------ audio/hal/hdi_passthrough/src/BUILD.gn | 6 +----- audio/hal/pathselect/src/BUILD.gn | 8 ++------ audio/sample/BUILD.gn | 12 ++---------- audio/supportlibs/adm_adapter/src/BUILD.gn | 12 ++---------- display/interfaces/hdi_cpp/client/BUILD.gn | 2 +- display/interfaces/hdi_cpp/server/BUILD.gn | 2 +- input/hal/BUILD.gn | 6 +----- misc/vibrator/hal/BUILD.gn | 6 +----- misc/vibrator/test/performance/BUILD.gn | 6 +----- misc/vibrator/test/unittest/BUILD.gn | 6 +----- sensor/hal/BUILD.gn | 6 +----- sensor/test/unittest/BUILD.gn | 6 +----- wlan/hal/BUILD.gn | 6 +----- wlan/hdi_service/BUILD.gn | 6 +----- wlan/test/hdi_service/BUILD.gn | 6 +----- wlan/test/unittest/BUILD.gn | 6 +----- 18 files changed, 26 insertions(+), 98 deletions(-) diff --git a/audio/hal/hdi_binder/proxy/src/BUILD.gn b/audio/hal/hdi_binder/proxy/src/BUILD.gn index d489f25f25..501a7e2493 100755 --- a/audio/hal/hdi_binder/proxy/src/BUILD.gn +++ b/audio/hal/hdi_binder/proxy/src/BUILD.gn @@ -99,14 +99,10 @@ ohos_shared_library("audio_hdi_proxy_server") { "$hdf_uhdf_path/config:libhdf_hcs", "$hdf_uhdf_path/hcs:hdf_default.hcb", ] - - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } - + + external_deps = [ "hilog_native:libhilog" ] + public_configs = [ ":hdi_service_proxy_config" ] - + subsystem_name = "hdf" -} \ No newline at end of file +} diff --git a/audio/hal/hdi_binder/server/src/BUILD.gn b/audio/hal/hdi_binder/server/src/BUILD.gn index be24e101f4..8075b563b8 100755 --- a/audio/hal/hdi_binder/server/src/BUILD.gn +++ b/audio/hal/hdi_binder/server/src/BUILD.gn @@ -83,13 +83,9 @@ ohos_shared_library("audio_hdi_adapter_server") { "$hdf_uhdf_path/hcs:hdf_default.hcb", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] public_configs = [ ":hdi_service_config" ] subsystem_name = "hdf" -} \ No newline at end of file +} diff --git a/audio/hal/hdi_passthrough/src/BUILD.gn b/audio/hal/hdi_passthrough/src/BUILD.gn index d34b78797b..37f84e90d9 100755 --- a/audio/hal/hdi_passthrough/src/BUILD.gn +++ b/audio/hal/hdi_passthrough/src/BUILD.gn @@ -99,11 +99,7 @@ ohos_shared_library("hdi_audio") { defines += [ "AUDIO_HAL_NOTSUPPORT_PATHSELECT" ] } - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] public_configs = [ ":hdi_audio_config" ] diff --git a/audio/hal/pathselect/src/BUILD.gn b/audio/hal/pathselect/src/BUILD.gn index e6972af1e5..c53fcaa83d 100755 --- a/audio/hal/pathselect/src/BUILD.gn +++ b/audio/hal/pathselect/src/BUILD.gn @@ -82,13 +82,9 @@ ohos_shared_library("hdi_audio_path_select") { "$hdf_uhdf_path/hcs:hdf_default.hcb", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] public_configs = [ ":pathseltct_config" ] subsystem_name = "hdf" -} \ No newline at end of file +} diff --git a/audio/sample/BUILD.gn b/audio/sample/BUILD.gn index 1ea6813406..d9f8798548 100755 --- a/audio/sample/BUILD.gn +++ b/audio/sample/BUILD.gn @@ -61,11 +61,7 @@ ohos_executable("audio_sample_render") { "$hdf_uhdf_path/osal:libhdf_utils", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] install_enable = true subsystem_name = "hdf" @@ -114,11 +110,7 @@ ohos_executable("audio_sample_capture") { "$hdf_uhdf_path/osal:libhdf_utils", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] install_enable = true subsystem_name = "hdf" diff --git a/audio/supportlibs/adm_adapter/src/BUILD.gn b/audio/supportlibs/adm_adapter/src/BUILD.gn index 4506b3c797..e3648fe84a 100755 --- a/audio/supportlibs/adm_adapter/src/BUILD.gn +++ b/audio/supportlibs/adm_adapter/src/BUILD.gn @@ -83,11 +83,7 @@ ohos_shared_library("hdi_audio_interface_lib_capture") { "$hdf_uhdf_path/hcs:hdf_default.hcb", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] public_configs = [ ":audio_interface_config" ] @@ -129,11 +125,7 @@ ohos_shared_library("hdi_audio_interface_lib_render") { "$hdf_uhdf_path/hcs:hdf_default.hcb", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] public_configs = [ ":audio_interface_config" ] diff --git a/display/interfaces/hdi_cpp/client/BUILD.gn b/display/interfaces/hdi_cpp/client/BUILD.gn index bc70052bd4..4db785738a 100644 --- a/display/interfaces/hdi_cpp/client/BUILD.gn +++ b/display/interfaces/hdi_cpp/client/BUILD.gn @@ -43,7 +43,7 @@ if (is_standard_system) { "ipc:ipc_core", ] } else { - external_deps = [ "hilog:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } # install_images = [ "vendor" ] diff --git a/display/interfaces/hdi_cpp/server/BUILD.gn b/display/interfaces/hdi_cpp/server/BUILD.gn index ab3728a114..2cbdb608a0 100644 --- a/display/interfaces/hdi_cpp/server/BUILD.gn +++ b/display/interfaces/hdi_cpp/server/BUILD.gn @@ -49,7 +49,7 @@ if (is_standard_system) { "ipc:ipc_core", ] } else { - external_deps = [ "hilog:libhilog" ] + external_deps = [ "hilog_native:libhilog" ] } # install_images = [ "vendor" ] diff --git a/input/hal/BUILD.gn b/input/hal/BUILD.gn index aca2536c52..d19a3ddc8e 100644 --- a/input/hal/BUILD.gn +++ b/input/hal/BUILD.gn @@ -100,10 +100,6 @@ if (defined(ohos_lite)) { ] subsystem_name = "hdf" - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/misc/vibrator/hal/BUILD.gn b/misc/vibrator/hal/BUILD.gn index 770e65b1ab..487cf5ee6e 100644 --- a/misc/vibrator/hal/BUILD.gn +++ b/misc/vibrator/hal/BUILD.gn @@ -87,10 +87,6 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] subsystem_name = "hdf" - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/misc/vibrator/test/performance/BUILD.gn b/misc/vibrator/test/performance/BUILD.gn index 0ab22d129c..8091c62659 100644 --- a/misc/vibrator/test/performance/BUILD.gn +++ b/misc/vibrator/test/performance/BUILD.gn @@ -74,10 +74,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/misc/vibrator/hal:hdi_vibrator", "//utils/native/base:utils", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/misc/vibrator/test/unittest/BUILD.gn b/misc/vibrator/test/unittest/BUILD.gn index fe710362e3..bce0974b95 100644 --- a/misc/vibrator/test/unittest/BUILD.gn +++ b/misc/vibrator/test/unittest/BUILD.gn @@ -74,10 +74,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/misc/vibrator/hal:hdi_vibrator", "//utils/native/base:utils", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/sensor/hal/BUILD.gn b/sensor/hal/BUILD.gn index 28fbef3af1..0e54257591 100644 --- a/sensor/hal/BUILD.gn +++ b/sensor/hal/BUILD.gn @@ -103,10 +103,6 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] subsystem_name = "hdf" - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/sensor/test/unittest/BUILD.gn b/sensor/test/unittest/BUILD.gn index cdec21ad58..47b6c98230 100644 --- a/sensor/test/unittest/BUILD.gn +++ b/sensor/test/unittest/BUILD.gn @@ -80,10 +80,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/sensor/hal:hdi_sensor", "//utils/native/base:utils", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/wlan/hal/BUILD.gn b/wlan/hal/BUILD.gn index 11fa73568f..5a0ce1af81 100755 --- a/wlan/hal/BUILD.gn +++ b/wlan/hal/BUILD.gn @@ -101,10 +101,6 @@ if (defined(ohos_lite)) { "-fno-strict-aliasing", ] subsystem_name = "hdf" - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } diff --git a/wlan/hdi_service/BUILD.gn b/wlan/hdi_service/BUILD.gn index f7d3d3adc2..9a10702e61 100644 --- a/wlan/hdi_service/BUILD.gn +++ b/wlan/hdi_service/BUILD.gn @@ -64,9 +64,5 @@ ohos_shared_library("wifi_hdi_device") { ] subsystem_name = "hdf" - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } diff --git a/wlan/test/hdi_service/BUILD.gn b/wlan/test/hdi_service/BUILD.gn index c39e6f5b7c..21ba5d6f9c 100644 --- a/wlan/test/hdi_service/BUILD.gn +++ b/wlan/test/hdi_service/BUILD.gn @@ -57,11 +57,7 @@ ohos_unittest("WlanHdiServiceTest") { "//drivers/adapter/uhdf2/include/host", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } ###########################end########################### diff --git a/wlan/test/unittest/BUILD.gn b/wlan/test/unittest/BUILD.gn index b8f93cafd5..af8b2d9f3b 100644 --- a/wlan/test/unittest/BUILD.gn +++ b/wlan/test/unittest/BUILD.gn @@ -102,10 +102,6 @@ if (defined(ohos_lite)) { "//drivers/peripheral/wlan/hal:wifi_hal", "//utils/native/base:utils", ] - if (is_standard_system) { - external_deps = [ "hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } } -- Gitee