From f89dee8034edee0347673ff94cbdff84eac5694a Mon Sep 17 00:00:00 2001 From: l30054665 Date: Thu, 28 Mar 2024 16:50:50 +0800 Subject: [PATCH] Independent compiler2 Signed-off-by: l30054665 --- inputdevicehandler/BUILD.gn | 8 ++++---- inputdevicehandler/test/inputhandlertest/BUILD.gn | 8 ++++---- interfaces/inner_kits/BUILD.gn | 4 ++-- interfaces/inner_kits/test/unittest/BUILD.gn | 4 ++-- interfaces/ipc/test/clientunittest/BUILD.gn | 4 ++-- interfaces/ipc/test/ipcunittest/BUILD.gn | 4 ++-- services/sink/inputcollector/BUILD.gn | 6 +++--- .../inputcollector/test/sinkcollectorunittest/BUILD.gn | 6 +++--- services/sink/sinkmanager/BUILD.gn | 4 ++-- .../sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn | 6 +++--- services/sink/transport/BUILD.gn | 4 ++-- services/sink/transport/test/sinktransunittest/BUILD.gn | 4 ++-- services/source/inputinject/BUILD.gn | 8 ++++---- .../source/inputinject/test/sourceinjectunittest/BUILD.gn | 2 +- .../sourcemanager/test/sourcemanagerunittest/BUILD.gn | 2 +- utils/test/unittest/BUILD.gn | 4 +--- 16 files changed, 38 insertions(+), 40 deletions(-) diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 87d928c..681860b 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -55,15 +55,15 @@ ohos_shared_library("libdinput_handler") { external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", + "dsoftbus:softbus_client", "ipc:ipc_core", "json:nlohmann_json_static", - "safwk:system_ability_fwk", "openssl:libcrypto_shared", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index 8c42372..e0a84a6 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -65,15 +65,15 @@ ohos_unittest("distributed_input_handler_test") { external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", + "dsoftbus:softbus_client", "ipc:ipc_core", "json:nlohmann_json_static", - "safwk:system_ability_fwk", "openssl:libcrypto_shared", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 56c02cd..ad34f6a 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -40,10 +40,10 @@ ohos_shared_library("libdinput_sdk") { public_configs = [ ":input_sdk_public_config" ] public_external_deps = [ - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "json:nlohmann_json_static", ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index beff13b..bf96214 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -98,10 +98,10 @@ ohos_unittest("distributed_input_inner_test") { external_deps = [ "c_utils:utils", "config_policy:configpolicy_util", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "ipc:ipc_core", "json:nlohmann_json_static", diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 91f2c1b..0348ee7 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -116,10 +116,10 @@ ohos_unittest("distributed_input_client_test") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 2bbf9ea..831a4e4 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -103,10 +103,10 @@ ohos_unittest("distributed_input_ipc_test") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 5945e3e..1afb5ad 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -54,16 +54,16 @@ ohos_shared_library("libdinput_collector") { external_deps = [ "c_utils:utils", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "ipc:ipc_core", "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "openssl:libcrypto_shared" ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index a50e08b..5dd311b 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -65,16 +65,16 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { external_deps = [ "c_utils:utils", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "ipc:ipc_core", "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "openssl:libcrypto_shared" ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index c322b8b..82146c3 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -73,10 +73,10 @@ ohos_shared_library("libdinput_sink") { "access_token:libtokenid_sdk", "c_utils:utils", "config_policy:configpolicy_util", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_surface:surface", "hisysevent:libhisysevent", diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index a54bdce..f2f809a 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -101,19 +101,19 @@ ohos_unittest("distributed_input_sinkmanager_test") { "access_token:libtoken_setproc", "c_utils:utils", "config_policy:configpolicy_util", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_surface:surface", "hicollie:libhicollie", "ipc:ipc_core", "json:nlohmann_json_static", + "openssl:libcrypto_shared", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "openssl:libcrypto_shared", "window_manager:libdm", ] diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 81d98d7..c3a88bc 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -57,10 +57,10 @@ ohos_shared_library("libdinput_sink_trans") { external_deps = [ "c_utils:utils", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hicollie:libhicollie", diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index be47056..ed461d3 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -84,10 +84,10 @@ ohos_unittest("distributed_input_sinktrans_test") { external_deps = [ "c_utils:utils", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_surface:surface", "hicollie:libhicollie", diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index d734901..8c28416 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -60,16 +60,16 @@ ohos_shared_library("libdinput_inject") { external_deps = [ "c_utils:utils", - "dsoftbus:softbus_client", - "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributed_av_receiver", - "distributed_hardware_fwk:libdhfwk_sdk", + "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", + "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_core", "json:nlohmann_json_static", - "safwk:system_ability_fwk", "openssl:libcrypto_shared", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index 5fa4726..06c0f34 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -85,8 +85,8 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "eventhandler:libeventhandler", "ipc:ipc_core", "json:nlohmann_json_static", - "safwk:system_ability_fwk", "openssl:libcrypto_shared", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index efe6752..15bf944 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -130,8 +130,8 @@ ohos_unittest("distributed_input_sourcemanager_test") { "hitrace:hitrace_meter", "ipc:ipc_core", "json:nlohmann_json_static", - "safwk:system_ability_fwk", "openssl:libcrypto_shared", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index c8e1949..35c5e73 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -64,9 +64,7 @@ ohos_unittest("distributed_input_utils_test") { "LOG_DOMAIN=0xD004120", ] - deps = [ - "${utils_path}:libdinput_utils", - ] + deps = [ "${utils_path}:libdinput_utils" ] external_deps = [ "c_utils:utils",