diff --git a/bundle.json b/bundle.json index 525a711..c3c4ec8 100755 --- a/bundle.json +++ b/bundle.json @@ -35,7 +35,7 @@ "safwk", "samgr", "dsoftbus", - "utils_base", + "c_utils", "distributed_hardware_fwk" ], "third_party":[ diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index cfb72a6..05a514c 100755 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/white_list_test" group("whitelistunittest") { @@ -32,7 +33,7 @@ ohos_unittest("distributed_input_white_list_test") { "${ipc_path}/src", "//foundation/distributedhardware/distributed_input/services/sink/transport/include", "//foundation/distributedhardware/distributed_input/frameworks/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -65,21 +66,20 @@ ohos_unittest("distributed_input_white_list_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/dsoftbus/sdk:softbus_client", "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/communication/dsoftbus/sdk:softbus_client", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 628d073..ca3740e 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_dfx_utils") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -29,8 +30,8 @@ ohos_shared_library("libdinput_dfx_utils") { ] sources = [ - "src/hisysevent_util.cpp", "src/hidumper.cpp", + "src/hisysevent_util.cpp", ] defines = [ @@ -40,18 +41,18 @@ ohos_shared_library("libdinput_dfx_utils") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//third_party/openssl:libcrypto_static", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index a876875..a7522db 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_handler") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -30,8 +31,8 @@ ohos_shared_library("libdinput_handler") { ] sources = [ - "src/distributed_input_handler.cpp", "${common_path}/include/input_hub.cpp", + "src/distributed_input_handler.cpp", ] defines = [ @@ -41,19 +42,19 @@ ohos_shared_library("libdinput_handler") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//third_party/openssl:libcrypto_static", ] external_deps = [ + "c_utils:utils", + "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "dsoftbus:softbus_client", ] cflags_cc = [ "-DHILOG_ENABLE" ] @@ -61,5 +62,4 @@ ohos_shared_library("libdinput_handler") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index d4771f5..b74dad6 100755 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_sdk") { include_dirs = [ @@ -21,7 +22,7 @@ ohos_shared_library("libdinput_sdk") { "${ipc_path}/include", "${ipc_path}/src", "${frameworks_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -34,36 +35,35 @@ ohos_shared_library("libdinput_sdk") { sources = [ "${common_path}/include/white_list_util.cpp", "${innerkits_path}/src/distributed_input_kit.cpp", - "${ipc_path}/src/distributed_input_client.cpp", - "${ipc_path}/src/dinput_sa_manager.cpp", - "${ipc_path}/src/distributed_input_source_proxy.cpp", - "${ipc_path}/src/distributed_input_source_stub.cpp", - "${ipc_path}/src/distributed_input_sink_proxy.cpp", - "${ipc_path}/src/distributed_input_sink_stub.cpp", - "${ipc_path}/src/register_d_input_call_back_proxy.cpp", - "${ipc_path}/src/register_d_input_call_back_stub.cpp", - "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", - "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", - "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", - "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", - "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", - "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", - "${ipc_path}/src/start_d_input_call_back_proxy.cpp", - "${ipc_path}/src/start_d_input_call_back_stub.cpp", - "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", - "${ipc_path}/src/stop_d_input_call_back_stub.cpp", - "${ipc_path}/src/start_d_input_server_call_back_proxy.cpp", - "${ipc_path}/src/start_d_input_server_call_back_stub.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", + "${ipc_path}/src/dinput_sa_manager.cpp", + "${ipc_path}/src/distributed_input_client.cpp", + "${ipc_path}/src/distributed_input_sink_proxy.cpp", + "${ipc_path}/src/distributed_input_sink_stub.cpp", + "${ipc_path}/src/distributed_input_source_proxy.cpp", + "${ipc_path}/src/distributed_input_source_stub.cpp", + "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", + "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", + "${ipc_path}/src/register_d_input_call_back_proxy.cpp", + "${ipc_path}/src/register_d_input_call_back_stub.cpp", + "${ipc_path}/src/start_d_input_call_back_proxy.cpp", + "${ipc_path}/src/start_d_input_call_back_stub.cpp", + "${ipc_path}/src/start_d_input_server_call_back_proxy.cpp", + "${ipc_path}/src/start_d_input_server_call_back_stub.cpp", + "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", + "${ipc_path}/src/stop_d_input_call_back_stub.cpp", + "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", + "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", + "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", + "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", ] deps = [ - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", - "${utils_path}:libdinput_utils" + "${utils_path}:libdinput_utils", ] defines = [ @@ -73,10 +73,11 @@ ohos_shared_library("libdinput_sdk") { ] external_deps = [ - "ipc:ipc_core", - "hiviewdfx_hilog_native:libhilog", - "samgr:samgr_proxy", + "c_utils:utils", "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index 7dd612d..e59c0dc 100755 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/inner_kits" group("unittest") { @@ -33,7 +34,7 @@ ohos_unittest("distributed_input_inner_test") { "//foundation/distributedhardware/distributed_input/services/include", "//foundation/distributedhardware/distributed_input/services/src", "//foundation/distributedhardware/distributed_input/frameworks/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -47,23 +48,23 @@ ohos_unittest("distributed_input_inner_test") { sources = [ "${common_path}/include/white_list_util.cpp", "${innerkits_path}/src/distributed_input_kit.cpp", - "${ipc_path}/src/register_d_input_call_back_proxy.cpp", - "${ipc_path}/src/register_d_input_call_back_stub.cpp", - "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", - "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", - "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", - "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", - "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", - "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", - "${ipc_path}/src/start_d_input_call_back_proxy.cpp", - "${ipc_path}/src/start_d_input_call_back_stub.cpp", - "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", - "${ipc_path}/src/stop_d_input_call_back_stub.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/del_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/distributed_input_source_proxy.cpp", + "${ipc_path}/src/prepare_d_input_call_back_proxy.cpp", + "${ipc_path}/src/prepare_d_input_call_back_stub.cpp", + "${ipc_path}/src/register_d_input_call_back_proxy.cpp", + "${ipc_path}/src/register_d_input_call_back_stub.cpp", + "${ipc_path}/src/start_d_input_call_back_proxy.cpp", + "${ipc_path}/src/start_d_input_call_back_stub.cpp", + "${ipc_path}/src/stop_d_input_call_back_proxy.cpp", + "${ipc_path}/src/stop_d_input_call_back_stub.cpp", + "${ipc_path}/src/unprepare_d_input_call_back_proxy.cpp", + "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", + "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", + "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", "//foundation/distributedhardware/distributed_input/interfaces/inner_kits/test/unittest/mock/mock_distributed_input_client.cpp", "distributed_input_inner_test.cpp", ] @@ -83,21 +84,20 @@ ohos_unittest("distributed_input_inner_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ + "c_utils:utils", + "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "dsoftbus:softbus_client", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/low_latency/BUILD.gn b/low_latency/BUILD.gn index b139944..6b25226 100755 --- a/low_latency/BUILD.gn +++ b/low_latency/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_low_latency") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -29,9 +30,7 @@ ohos_shared_library("libdinput_low_latency") { "//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client/include", ] - sources = [ - "src/dinput_low_latency.cpp", - ] + sources = [ "src/dinput_low_latency.cpp" ] defines = [ "HI_LOG_ENABLE", @@ -40,18 +39,18 @@ ohos_shared_library("libdinput_low_latency") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", - "//third_party/openssl:libcrypto_static", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client:ressched_client", "//third_party/jsoncpp:jsoncpp", + "//third_party/openssl:libcrypto_static", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] @@ -60,5 +59,4 @@ ohos_shared_library("libdinput_low_latency") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index b79fc44..84ed358 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -12,21 +12,17 @@ # limitations under the License. import("//build/ohos.gni") -import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//build/ohos/sa_profile/sa_profile.gni") +import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") ohos_sa_profile("distributed_input_source_sa_profile") { - sources = [ - "4809.xml" - ] + sources = [ "4809.xml" ] part_name = "distributed_input" } ohos_sa_profile("distributed_input_sink_sa_profile") { - sources = [ - "4810.xml" - ] + sources = [ "4810.xml" ] part_name = "distributed_input" } diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 17cdc8a..2e935ed 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_collector") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -29,8 +30,8 @@ ohos_shared_library("libdinput_collector") { ] sources = [ - "src/distributed_input_collector.cpp", "${common_path}/include/input_hub.cpp", + "src/distributed_input_collector.cpp", ] defines = [ @@ -40,17 +41,17 @@ ohos_shared_library("libdinput_collector") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//third_party/openssl:libcrypto_static", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] @@ -59,5 +60,4 @@ ohos_shared_library("libdinput_collector") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index fe73801..2e2387c 100755 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_sink") { include_dirs = [ @@ -22,7 +23,7 @@ ohos_shared_library("libdinput_sink") { "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -39,13 +40,13 @@ ohos_shared_library("libdinput_sink") { ] sources = [ - "src/distributed_input_sink_manager.cpp", - "src/distributed_input_sink_event_handler.cpp", - "${ipc_path}/src/distributed_input_sink_stub.cpp", - "${common_path}/include/white_list_util.cpp", "${common_path}/include/dinput_sa_process_state.cpp", + "${common_path}/include/white_list_util.cpp", + "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/start_d_input_server_call_back_proxy.cpp", "${ipc_path}/src/start_d_input_server_call_back_stub.cpp", + "src/distributed_input_sink_event_handler.cpp", + "src/distributed_input_sink_manager.cpp", ] defines = [ @@ -55,29 +56,27 @@ ohos_shared_library("libdinput_sink") { ] if (distributed_input_low_latency) { - defines += [ - "DINPUT_LOW_LATENCY", - ] + defines += [ "DINPUT_LOW_LATENCY" ] } deps = [ - "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/distributedhardware/distributed_input/services/sink/transport:libdinput_sink_trans", - "//foundation/distributedhardware/distributed_input/services/sink/inputcollector:libdinput_collector", "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", + "//foundation/distributedhardware/distributed_input/services/sink/inputcollector:libdinput_collector", + "//foundation/distributedhardware/distributed_input/services/sink/transport:libdinput_sink_trans", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index a06cce7..3fdce06 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/sink_manager" group("sinkmanagerunittest") { @@ -33,7 +34,7 @@ ohos_unittest("distributed_input_sinkmanager_test") { "//foundation/distributedhardware/distributed_input/services/sink/transport/include", "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/include", "//foundation/distributedhardware/distributed_input/frameworks/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -50,18 +51,18 @@ ohos_unittest("distributed_input_sinkmanager_test") { ] sources = [ - "${common_path}/include/white_list_util.cpp", - "${common_path}/include/input_hub.cpp", "${common_path}/include/dinput_sa_process_state.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", - "distributed_input_sinkmanager_test.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_event_handler.cpp", + "${common_path}/include/input_hub.cpp", + "${common_path}/include/white_list_util.cpp", "${ipc_path}/src/distributed_input_sink_stub.cpp", "${ipc_path}/src/start_d_input_server_call_back_proxy.cpp", "${ipc_path}/src/start_d_input_server_call_back_stub.cpp", "${services_sink_path}/inputcollector/src/distributed_input_collector.cpp", + "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_event_handler.cpp", + "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp", + "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", + "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", + "distributed_input_sinkmanager_test.cpp", ] cflags = [ @@ -79,31 +80,28 @@ ohos_unittest("distributed_input_sinkmanager_test") { ] if (distributed_input_low_latency) { - defines += [ - "DINPUT_LOW_LATENCY", - ] + defines += [ "DINPUT_LOW_LATENCY" ] } deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", + "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//foundation/communication/dsoftbus/sdk:softbus_client", "//third_party/openssl:libcrypto_static", - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - "${low_latency_path}:libdinput_low_latency", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index bce59a0..50ae5d6 100755 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_sink_trans") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -33,8 +34,8 @@ ohos_shared_library("libdinput_sink_trans") { ] sources = [ + "src/distributed_input_sink_switch.cpp", "src/distributed_input_sink_transport.cpp", - "src/distributed_input_sink_switch.cpp" ] defines = [ @@ -44,26 +45,24 @@ ohos_shared_library("libdinput_sink_trans") { ] if (distributed_input_low_latency) { - defines += [ - "DINPUT_LOW_LATENCY", - ] + defines += [ "DINPUT_LOW_LATENCY" ] } deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/dsoftbus/sdk:softbus_client", "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/communication/dsoftbus/sdk:softbus_client", + "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] @@ -72,5 +71,4 @@ ohos_shared_library("libdinput_sink_trans") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index fe0dc53..daa2cbc 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/sink_trans" group("sinktransunittest") { @@ -27,10 +28,9 @@ ohos_unittest("distributed_input_sinktrans_test") { include_dirs = [ "//foundation/distributedhardware/distributed_input/services/sink/transport/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", - "//utils/native/base/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -64,23 +64,22 @@ ohos_unittest("distributed_input_sinktrans_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/dsoftbus/sdk:softbus_client", "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/communication/dsoftbus/sdk:softbus_client", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index fc8bfa5..7d82544 100755 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_inject") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -30,6 +31,7 @@ ohos_shared_library("libdinput_inject") { ] sources = [ + "${common_path}/include/input_hub.cpp", "src/distributed_input_inject.cpp", "src/distributed_input_node_manager.cpp", "src/virtual_device.cpp", @@ -37,7 +39,6 @@ ohos_shared_library("libdinput_inject") { "src/virtual_mouse.cpp", "src/virtual_touchpad.cpp", "src/virtual_touchscreen.cpp", - "${common_path}/include/input_hub.cpp", ] defines = [ @@ -47,18 +48,18 @@ ohos_shared_library("libdinput_inject") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//third_party/openssl:libcrypto_static", "${dfx_utils_path}:libdinput_dfx_utils", + "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//third_party/openssl:libcrypto_static", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] @@ -67,5 +68,4 @@ ohos_shared_library("libdinput_inject") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index a6641d7..3de37b6 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/source_inject" group("sourceinjectunittest") { @@ -32,7 +33,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "${ipc_path}/src", "//foundation/distributedhardware/distributed_input/services/source/inputinject/include", "//foundation/distributedhardware/distributed_input/frameworks/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -47,6 +48,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { ] sources = [ + "${common_path}/include/input_hub.cpp", "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_inject.cpp", "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_node_manager.cpp", "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_device.cpp", @@ -55,7 +57,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_touchpad.cpp", "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_touchscreen.cpp", "distributed_input_sourceinject_test.cpp", - "${common_path}/include/input_hub.cpp", ] cflags = [ @@ -73,23 +74,22 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/dsoftbus/sdk:softbus_client", "${dfx_utils_path}:libdinput_dfx_utils", + "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/communication/dsoftbus/sdk:softbus_client", "//third_party/openssl:libcrypto_static", ] external_deps = [ + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index e792990..2988f1e 100755 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_source") { include_dirs = [ @@ -22,7 +23,7 @@ ohos_shared_library("libdinput_source") { "${innerkits_path}/src", "${ipc_path}/include", "${ipc_path}/src", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -40,10 +41,8 @@ ohos_shared_library("libdinput_source") { ] sources = [ - "src/distributed_input_source_manager.cpp", - "src/distributed_input_source_event_handler.cpp", - "${common_path}/include/white_list_util.cpp", "${common_path}/include/dinput_sa_process_state.cpp", + "${common_path}/include/white_list_util.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", @@ -66,6 +65,8 @@ ohos_shared_library("libdinput_source") { "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", + "src/distributed_input_source_event_handler.cpp", + "src/distributed_input_source_manager.cpp", ] defines = [ @@ -75,30 +76,28 @@ ohos_shared_library("libdinput_source") { ] if (distributed_input_low_latency) { - defines += [ - "DINPUT_LOW_LATENCY", - ] + defines += [ "DINPUT_LOW_LATENCY" ] } deps = [ - "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", + "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans", ] external_deps = [ - "ipc:ipc_core", - "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", - "samgr:samgr_proxy", + "c_utils:utils", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 1a4058b..aeead22 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/source_manager" group("sourcemanagerunittest") { @@ -32,7 +33,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${ipc_path}/src", "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/include", "//foundation/distributedhardware/distributed_input/frameworks/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -52,18 +53,8 @@ ohos_unittest("distributed_input_sourcemanager_test") { ] sources = [ - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_event_handler.cpp", - "distributed_input_sourcemanager_test.cpp", "${common_path}/include/dinput_sa_process_state.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_inject.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_node_manager.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_device.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_keyboard.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_mouse.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_touchpad.cpp", - "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_touchscreen.cpp", - "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", + "${common_path}/include/input_hub.cpp", "${ipc_path}/src/add_white_list_infos_call_back_proxy.cpp", "${ipc_path}/src/add_white_list_infos_call_back_stub.cpp", "${ipc_path}/src/del_white_list_infos_call_back_proxy.cpp", @@ -86,7 +77,17 @@ ohos_unittest("distributed_input_sourcemanager_test") { "${ipc_path}/src/unprepare_d_input_call_back_stub.cpp", "${ipc_path}/src/unregister_d_input_call_back_proxy.cpp", "${ipc_path}/src/unregister_d_input_call_back_stub.cpp", - "${common_path}/include/input_hub.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_inject.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/distributed_input_node_manager.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_device.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_keyboard.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_mouse.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_touchpad.cpp", + "//foundation/distributedhardware/distributed_input/services/source/inputinject/src/virtual_touchscreen.cpp", + "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_event_handler.cpp", + "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_manager.cpp", + "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", + "distributed_input_sourcemanager_test.cpp", ] cflags = [ @@ -104,33 +105,30 @@ ohos_unittest("distributed_input_sourcemanager_test") { ] if (distributed_input_low_latency) { - defines += [ - "DINPUT_LOW_LATENCY", - ] + defines += [ "DINPUT_LOW_LATENCY" ] } deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", + "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - "${low_latency_path}:libdinput_low_latency", "//third_party/openssl:libcrypto_static", ] external_deps = [ - "ipc:ipc_core", - "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", - "samgr:samgr_proxy", + "c_utils:utils", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 193398d..c38a689 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -12,13 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_source_trans") { include_dirs = [ "include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -35,9 +36,7 @@ ohos_shared_library("libdinput_source_trans") { "${low_latency_path}/include", ] - sources = [ - "src/distributed_input_source_transport.cpp" - ] + sources = [ "src/distributed_input_source_transport.cpp" ] defines = [ "HI_LOG_ENABLE", @@ -46,29 +45,27 @@ ohos_shared_library("libdinput_source_trans") { ] if (distributed_input_low_latency) { - defines += [ - "DINPUT_LOW_LATENCY", - ] + defines += [ "DINPUT_LOW_LATENCY" ] } deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", + "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - "${low_latency_path}:libdinput_low_latency", ] external_deps = [ + "c_utils:utils", + "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hitrace_native:hitrace_meter", ] cflags_cc = [ "-DHILOG_ENABLE" ] @@ -76,5 +73,4 @@ ohos_shared_library("libdinput_source_trans") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index cd4f21c..7b4c836 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/source_trans" group("sourcetransunittest") { @@ -27,10 +28,9 @@ ohos_unittest("distributed_input_sourcetrans_test") { include_dirs = [ "//foundation/distributedhardware/distributed_input/services/source/transport/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", - "//utils/native/base/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -65,26 +65,25 @@ ohos_unittest("distributed_input_sourcetrans_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", + "${low_latency_path}:libdinput_low_latency", + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", - "//foundation/communication/dsoftbus/sdk:softbus_client", - "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", - "${low_latency_path}:libdinput_low_latency", ] external_deps = [ + "c_utils:utils", + "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hitrace_native:hitrace_meter", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - -## UnitTest distributed_input_manager_service_test }}} \ No newline at end of file +## UnitTest distributed_input_manager_service_test }}} diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index fc514a3..02641dc 100755 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_sink_handler") { include_dirs = [ @@ -25,7 +26,7 @@ ohos_shared_library("libdinput_sink_handler") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -36,7 +37,7 @@ ohos_shared_library("libdinput_sink_handler") { sources = [ "src/distributed_input_sink_handler.cpp", - "src/load_d_input_sink_callback.cpp" + "src/load_d_input_sink_callback.cpp", ] defines = [ @@ -46,20 +47,20 @@ ohos_shared_library("libdinput_sink_handler") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_sink_path}/sinkmanager:libdinput_sink", - "${dfx_utils_path}:libdinput_dfx_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] @@ -67,5 +68,4 @@ ohos_shared_library("libdinput_sink_handler") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 680f75f..9a60f7b 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/sink_handler" group("unittest") { @@ -35,7 +36,7 @@ ohos_unittest("distributed_input_sink_handler_test") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -48,8 +49,8 @@ ohos_unittest("distributed_input_sink_handler_test") { sources = [ "//foundation/distributedhardware/distributed_input/sinkhandler/src/distributed_input_sink_handler.cpp", "//foundation/distributedhardware/distributed_input/sinkhandler/src/load_d_input_sink_callback.cpp", - "distributed_input_sinkhandler_test.cpp", "//foundation/distributedhardware/distributed_input/sinkhandler/test/unittest/mock/mock_distributed_input_client.cpp", + "distributed_input_sinkhandler_test.cpp", ] cflags = [ @@ -67,23 +68,22 @@ ohos_unittest("distributed_input_sink_handler_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_source_path}/sourcemanager:libdinput_source", - "${dfx_utils_path}:libdinput_dfx_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 18bab0b..2351bba 100755 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_source_handler") { include_dirs = [ @@ -25,7 +26,7 @@ ohos_shared_library("libdinput_source_handler") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -36,7 +37,7 @@ ohos_shared_library("libdinput_source_handler") { sources = [ "src/distributed_input_source_handler.cpp", - "src/load_d_input_source_callback.cpp" + "src/load_d_input_source_callback.cpp", ] defines = [ @@ -46,20 +47,20 @@ ohos_shared_library("libdinput_source_handler") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_source_path}/sourcemanager:libdinput_source", - "${dfx_utils_path}:libdinput_dfx_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] @@ -67,5 +68,4 @@ ohos_shared_library("libdinput_source_handler") { subsystem_name = "distributedhardware" part_name = "distributed_input" - } diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index dd17b5a..0e93c65 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/source_handler" group("unittest") { @@ -35,7 +36,7 @@ ohos_unittest("distributed_input_source_handler_test") { "${frameworks_path}/include", "${service_common}/include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", @@ -48,8 +49,8 @@ ohos_unittest("distributed_input_source_handler_test") { sources = [ "//foundation/distributedhardware/distributed_input/sourcehandler/src/distributed_input_source_handler.cpp", "//foundation/distributedhardware/distributed_input/sourcehandler/src/load_d_input_source_callback.cpp", - "distributed_input_sourcehandler_test.cpp", "//foundation/distributedhardware/distributed_input/sourcehandler/test/unittest/mock/mock_distributed_input_client.cpp", + "distributed_input_sourcehandler_test.cpp", ] cflags = [ @@ -67,23 +68,22 @@ ohos_unittest("distributed_input_source_handler_test") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", + "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", "${services_source_path}/sourcemanager:libdinput_source", - "${dfx_utils_path}:libdinput_dfx_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", ] external_deps = [ + "c_utils:utils", + "hisysevent_native:libhisysevent", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hisysevent_native:libhisysevent", ] cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_manager_service_test }}} diff --git a/test/BUILD.gn b/test/BUILD.gn index f86c930..d43e349 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -14,7 +14,5 @@ group("test") { testonly = true - deps = [ - "fuzztest:fuzztest", - ] + deps = [ "fuzztest:fuzztest" ] } diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index d42a052..4c204b3 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -15,8 +15,8 @@ group("fuzztest") { testonly = true deps = [ - "distributedinputkit_fuzzer:fuzztest", "distributedinputclient_fuzzer:fuzztest", + "distributedinputkit_fuzzer:fuzztest", "distributedinputsinktransport_fuzzer:fuzztest", "distributedinputsourcetransport_fuzzer:fuzztest", ] diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index a8f622b..376ae6f 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -14,11 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ##############################fuzztest########################################## ohos_fuzztest("DistributedInputClientFuzzTest") { module_out_path = "distributed_input/system" + # fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputclient_fuzzer" include_dirs = [ @@ -32,7 +34,7 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${distributedinput_path}/sinkhandler/include", "${distributedinput_path}/inputdevicehandler/include", "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${service_common}/include", "${common_path}/include", @@ -50,46 +52,42 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "-fno-omit-frame-pointer", ] - sources = [ - "distributed_input_client_fuzzer.cpp", - ] + sources = [ "distributed_input_client_fuzzer.cpp" ] deps = [ - "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", - "${distributedinput_path}/services/source/sourcemanager:libdinput_source", - "${distributedinput_path}/services/source/inputinject:libdinput_inject", - "${distributedinput_path}/services/source/transport:libdinput_source_trans", - "${distributedinput_path}/services/sink/sinkmanager:libdinput_sink", - "${distributedinput_path}/services/sink/inputcollector:libdinput_collector", - "${distributedinput_path}/services/sink/transport:libdinput_sink_trans", - "${distributedinput_path}/sourcehandler:libdinput_source_handler", - "${distributedinput_path}/sinkhandler:libdinput_sink_handler", "${distributedinput_path}/inputdevicehandler:libdinput_handler", + "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", + "${distributedinput_path}/services/sink/inputcollector:libdinput_collector", + "${distributedinput_path}/services/sink/sinkmanager:libdinput_sink", + "${distributedinput_path}/services/sink/transport:libdinput_sink_trans", + "${distributedinput_path}/services/source/inputinject:libdinput_inject", + "${distributedinput_path}/services/source/sourcemanager:libdinput_source", + "${distributedinput_path}/services/source/transport:libdinput_source_trans", + "${distributedinput_path}/sinkhandler:libdinput_sink_handler", + "${distributedinput_path}/sourcehandler:libdinput_source_handler", "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - ] + ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - ] + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"DistributedInputClientFuzzTest\"", "LOG_DOMAIN=0xD004100", - ] - + ] } + ############################################################################### group("fuzztest") { testonly = true - deps = [ - ":DistributedInputClientFuzzTest", - ] + deps = [ ":DistributedInputClientFuzzTest" ] } ############################################################################### diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index bb4cb09..cb20359 100755 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -14,11 +14,13 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ##############################fuzztest########################################## ohos_fuzztest("DistributedInputKitFuzzTest") { module_out_path = "distributed_input/system" + # fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputkit_fuzzer" include_dirs = [ @@ -32,7 +34,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${distributedinput_path}/sinkhandler/include", "${distributedinput_path}/inputdevicehandler/include", "//foundation/distributedhardware/distributed_hardware_fwk/common/utils/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${service_common}/include", "${common_path}/include", @@ -50,46 +52,42 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "-fno-omit-frame-pointer", ] - sources = [ - "distributed_input_kit_fuzzer.cpp", - ] + sources = [ "distributed_input_kit_fuzzer.cpp" ] deps = [ - "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", - "${distributedinput_path}/services/source/sourcemanager:libdinput_source", - "${distributedinput_path}/services/source/inputinject:libdinput_inject", - "${distributedinput_path}/services/source/transport:libdinput_source_trans", - "${distributedinput_path}/services/sink/sinkmanager:libdinput_sink", - "${distributedinput_path}/services/sink/inputcollector:libdinput_collector", - "${distributedinput_path}/services/sink/transport:libdinput_sink_trans", - "${distributedinput_path}/sourcehandler:libdinput_source_handler", - "${distributedinput_path}/sinkhandler:libdinput_sink_handler", "${distributedinput_path}/inputdevicehandler:libdinput_handler", + "${distributedinput_path}/interfaces/inner_kits:libdinput_sdk", + "${distributedinput_path}/services/sink/inputcollector:libdinput_collector", + "${distributedinput_path}/services/sink/sinkmanager:libdinput_sink", + "${distributedinput_path}/services/sink/transport:libdinput_sink_trans", + "${distributedinput_path}/services/source/inputinject:libdinput_inject", + "${distributedinput_path}/services/source/sourcemanager:libdinput_source", + "${distributedinput_path}/services/source/transport:libdinput_source_trans", + "${distributedinput_path}/sinkhandler:libdinput_sink_handler", + "${distributedinput_path}/sourcehandler:libdinput_source_handler", "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - ] + ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - ] + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"DistributedInputKitFuzzTest\"", "LOG_DOMAIN=0xD004100", - ] - + ] } + ############################################################################### group("fuzztest") { testonly = true - deps = [ - ":DistributedInputKitFuzzTest", - ] + deps = [ ":DistributedInputKitFuzzTest" ] } ############################################################################### diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index c7b2551..c86cd9e 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -14,16 +14,18 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ##############################fuzztest########################################## ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { module_out_path = "distributed_input/system" + # fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputsinktransport_fuzzer" include_dirs = [ "//foundation/distributedhardware/distributed_input/services/sink/transport/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", "${fwk_common_path}/log/include", @@ -50,36 +52,34 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { ] deps = [ - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/dsoftbus/sdk:softbus_client", "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", "${low_latency_path}:libdinput_low_latency", - ] + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/communication/dsoftbus/sdk:softbus_client", + ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - ] + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"DistributedInputSinkTransportFuzzTest\"", "LOG_DOMAIN=0xD004100", - ] - + ] } + ############################################################################### group("fuzztest") { testonly = true - deps = [ - ":DistributedInputSinkTransportFuzzTest", - ] + deps = [ ":DistributedInputSinkTransportFuzzTest" ] } ############################################################################### diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index a8913b7..e9e8365 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -14,19 +14,21 @@ #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ##############################fuzztest########################################## ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { module_out_path = "distributed_input/system" + # fuzz_config_file = "//foundation/distributedhardware/distributed_input/test/fuzztest/distributedinputsourcetransport_fuzzer" include_dirs = [ "//foundation/distributedhardware/distributed_input/services/source/transport/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "//utils/system/safwk/native/include", "${common_path}/include", - "//utils/native/base/include", + "//commonlibrary/c_utils/base/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/log", @@ -54,39 +56,37 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { ] deps = [ - "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", - "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans", - "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "${dfx_utils_path}:libdinput_dfx_utils", - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", "${low_latency_path}:libdinput_low_latency", - ] + "${utils_path}:libdinput_utils", + "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", + "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk", + "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", + "//foundation/distributedhardware/distributed_input/services/source/transport:libdinput_source_trans", + ] external_deps = [ + "c_utils:utils", "dsoftbus:softbus_client", + "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", - "hiviewdfx_hilog_native:libhilog", "samgr:samgr_proxy", - "hitrace_native:hitrace_meter", - ] + ] defines = [ "HI_LOG_ENABLE", "DH_LOG_TAG=\"DistributedInputSourceTransportFuzzTest\"", "LOG_DOMAIN=0xD004100", - ] - + ] } + ############################################################################### group("fuzztest") { testonly = true - deps = [ - ":DistributedInputSourceTransportFuzzTest", - ] + deps = [ ":DistributedInputSourceTransportFuzzTest" ] } ############################################################################### diff --git a/utils/BUILD.gn b/utils/BUILD.gn index ec60ec4..a2c6599 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") ohos_shared_library("libdinput_utils") { include_dirs = [ @@ -27,8 +28,8 @@ ohos_shared_library("libdinput_utils") { ] sources = [ - "src/dinput_utils_tool.cpp", "src/dinput_context.cpp", + "src/dinput_utils_tool.cpp", ] defines = [ @@ -37,9 +38,7 @@ ohos_shared_library("libdinput_utils") { "LOG_DOMAIN=0xD004100", ] - deps = [ - "${fwk_utils_path}:distributedhardwareutils", - ] + deps = [ "${fwk_utils_path}:distributedhardwareutils" ] external_deps = [ "dsoftbus:softbus_client", diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 83c7c73..86b000d 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributed_input/distributedinput.gni") +import( + "//foundation/distributedhardware/distributed_input/distributedinput.gni") module_out_path = "distributed_input/utils" group("unittest") { @@ -35,9 +36,7 @@ ohos_unittest("distributed_input_utils_test") { "${common_path}/include", ] - sources = [ - "dinput_context_test.cpp", - ] + sources = [ "dinput_context_test.cpp" ] cflags = [ "-Wall", @@ -65,5 +64,4 @@ ohos_unittest("distributed_input_utils_test") { cflags_cc = [ "-DHILOG_ENABLE" ] } - ## UnitTest distributed_input_utils_test }}}