diff --git a/audio/hal/hdi_binder/proxy/src/BUILD.gn b/audio/hal/hdi_binder/proxy/src/BUILD.gn index d13c349cbdaa5d6f99fd65b788ca0a10617ed583..501a7e24934431a56e932d3319a1f96a54581278 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 = [ "hiviewdfx_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 e412aeb88f4e0567c3fdf35dd0d332b7419b5cd9..8075b563b8d29b2e25b4709de2e336840798f541 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 = [ "hiviewdfx_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 da21ce1e24a55a8468464daccd86a2af18d0f867..37f84e90d9885ed471659b5c02258b58e2c302e0 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 = [ "hiviewdfx_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 fef400147c7041a176acc1e0f223ccb8ba68c6a2..c53fcaa83d4960c7ae274017f79ed6619a647ded 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 = [ "hiviewdfx_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 13ffbd97403249042dd9610c3a3ea1f65531c12d..d9f8798548c234df23b924678e52c04f09eb3b10 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 = [ "hiviewdfx_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 = [ "hiviewdfx_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 bed981a7bd689b937f84bbf3fc40a3c7c27fce44..e3648fe84a4694c361271d7e9d3fe4b2c2bd1fe5 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 = [ "hiviewdfx_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 = [ "hiviewdfx_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 efedbf58388c905a214397f8864ba92816f406ef..4db785738ad4f96908cf4e954238adb5a4c8a5c3 100644 --- a/display/interfaces/hdi_cpp/client/BUILD.gn +++ b/display/interfaces/hdi_cpp/client/BUILD.gn @@ -39,11 +39,11 @@ if (is_standard_system) { if (is_standard_system) { external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "hilog_native:libhilog", "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 961695d24dac7c10c78e287dcccc3e93810f38d0..2cbdb608a0eafab4450066ad632d9bcdcc675ae0 100644 --- a/display/interfaces/hdi_cpp/server/BUILD.gn +++ b/display/interfaces/hdi_cpp/server/BUILD.gn @@ -45,11 +45,11 @@ if (is_standard_system) { if (is_standard_system) { external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "hilog_native:libhilog", "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 b6e00a3d35cdadcd7e0eda4b4e2e4c63344ef379..d19a3ddc8e9d0ef73262ec428acbb9409edacb45 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 = [ "hiviewdfx_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 5f3af3e1167174556146c3de2fc53d30886f244b..487cf5ee6eaa52bfcc1ddb227b9e4b8df365cf64 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 = [ "hiviewdfx_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 f08cb939081bf8bb92aa2ef1669d458916aa021f..8091c6265977d90899e2ec74c669318720b7bfae 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 = [ "hiviewdfx_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 b40e981196ceafbdd2f6032d18ee56048c3a1d03..bce0974b950b0d052bc58746733556ab8a165bd1 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 = [ "hiviewdfx_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 4a6b7b69320eae6a415b3189c4f82d2381ed7b22..0e54257591dafff3aa2879c2b6983f1f5ab34004 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 = [ "hiviewdfx_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 25832be5c5c5d8999e57d7e18acf25f4b4d7a50f..47b6c982301c8cbef726ab145e31ec92c05f6295 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 = [ "hiviewdfx_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 10e3fb83766c2fd799a8677f552e2a9bf1c7883d..5a0ce1af812922f42e39e36bd8270d0d385e5367 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 = [ "hiviewdfx_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 4438ba7f74b56a0c10b17cc5229fed02c311489a..9a10702e6116f68977763cde45f9c1c187c8a244 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 = [ "hiviewdfx_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 c57c104250df3d0fe82d0bc6bfc0309fb2e41bd1..21ba5d6f9c9e73abe61c28f353addd3f7acd3fa8 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 = [ "hiviewdfx_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 6150d220ecf4f651606706e199f7a694b9a488f7..af8b2d9f3b35cfa2450430aff3a5b44740e4d204 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 = [ "hiviewdfx_hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } + external_deps = [ "hilog_native:libhilog" ] } }