diff --git a/distributedinput.gni b/distributedinput.gni index 907f3096b46adced28ad86aab23f2348a0e8ec24..2af072d380a608d72ce93737819d34b106d609a0 100644 --- a/distributedinput.gni +++ b/distributedinput.gni @@ -38,4 +38,6 @@ fwk_common_path = "${distributedhardwarefwk_path}/common" fwk_interfaces_path = "${distributedhardwarefwk_path}/interfaces/inner_kits" +av_transport_path = "${distributedhardwarefwk_path}/av_transport" + distributedinput_ldflags = [ "-lpthread" ] diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 3349e1e9ad7fa65c078fc13d3a442de071e96466..53a5bc6f366d34d1ac629a4a8e72f9973380b608 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_handler") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${common_path}/include", "${fwk_common_path}/log/include", diff --git a/inputdevicehandler/test/inputhandlertest/BUILD.gn b/inputdevicehandler/test/inputhandlertest/BUILD.gn index bfbfe7889b930bb91498889e58a6e35aca760599..be88283e7e5125ccf15314ddac22600249e3644a 100644 --- a/inputdevicehandler/test/inputhandlertest/BUILD.gn +++ b/inputdevicehandler/test/inputhandlertest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_handler_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${common_path}/include", "${fwk_common_path}/log/include", "${fwk_common_path}/utils/include", diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 740bd2938e5e1f9a10c9c2799e94662076583947..8bb8c1f38f4360d9fb09389a2c4927a20846b5be 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -17,6 +17,7 @@ import( config("input_sdk_public_config") { include_dirs = [ + "${av_transport_path}/common/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index 535807dc32006d49134807d8ffd5c720d813bafb..c8ca0629fbddb57ee5aed94c4c07478683931b8e 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_inner_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/interfaces/ipc/test/clientunittest/BUILD.gn b/interfaces/ipc/test/clientunittest/BUILD.gn index 635a24397b5d4e6e6109bb2843512ac22e2ff84e..c380c12c2a6770b970e3fce3023c83596bc4bee2 100644 --- a/interfaces/ipc/test/clientunittest/BUILD.gn +++ b/interfaces/ipc/test/clientunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_client_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", diff --git a/interfaces/ipc/test/ipcunittest/BUILD.gn b/interfaces/ipc/test/ipcunittest/BUILD.gn index 0d859538e96f74dc701c6e5681f33754b0f9950e..8f0d33b4ae82a3028cde79f2c67497c681fce8d4 100644 --- a/interfaces/ipc/test/ipcunittest/BUILD.gn +++ b/interfaces/ipc/test/ipcunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_ipc_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${common_path}/include", "${frameworks_path}/include", "${fwk_common_path}/log/include", diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index b5c5413140c147893a0efe54bfbedefea0e91658..6e18351de9148668be5ea57a1dcba09b8b3581ae 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_collector") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${common_path}/include", "${frameworks_path}/include", diff --git a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn index d02da9fba035b6e2984b02f50fb431ffe8494650..286653c026110dc0bbcfce485036949d9660c3de 100644 --- a/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn +++ b/services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_inner_sinkcollector_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${services_sink_path}/inputcollector/include", "${common_path}/include", "${frameworks_path}/include", diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index bb291cd4b50bad0724a694aca5e61a70f26db9c9..6e097cce3d9f64aedf8f1147db19b71797a1524a 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_sink") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${frameworks_path}/include", "${innerkits_path}/include", diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index 4dac2b3ad8a8bbc42a3c1da9892711f75c359233..2a1db131353090b64ff6733b2d77ad5ffdc60df5 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_sinkmanager_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${innerkits_path}/include", "${innerkits_path}/src", "${ipc_path}/include", diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index ef0d374855624cb30fe31ebf38a936c376e180f0..7006637fe1dc2b1d7bcfa6bdc058881812c15397 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_sink_trans") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${common_path}/include", "${frameworks_path}/include", diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 94ce8a5bfd6a7e3d1d0ac1cedd24f3a53bbc978d..40c3c60c28ff566a7c35e8b4aab4bde1be68fabc 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_sinktrans_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${services_sink_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 8d1a8a65b017d036c6b3222f0a9d15b002c03d75..34e49ddd06ea06cb6dbfca83b8b9cf1b1f9eb8b5 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_inject") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${common_path}/include", "${frameworks_path}/include", diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index a0a847a1861502108ba383bde9402993bd700dd8..d0ad8520d7c02faa66c0ef195b4d90ea3a85beb4 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${innerkits_path}/include", "${ipc_path}/include", "${services_source_path}/inputinject/include", diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index ee0760293f086647ab2413d77290ac8653870ff2..bc0f6cc73677847fd47aaf8c898f0cf7929add9b 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_source") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${frameworks_path}/include", "${innerkits_path}/include", diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 2b43fac88f136452a752c7518b13d28c7113e85b..635b26939b19ac98f846bed62a1bf54e2929a877 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${innerkits_path}/include", "${innerkits_path}/ipc/include", "${innerkits_path}/src", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 9359c141478309f4c765bbc4de2311bf531e5ff6..5d1a8ea6e03e486adbff7fb1728c9948b0fe2852 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_source_trans") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${common_path}/include", "${fwk_common_path}/log/include", diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index ab1c3ef507df3b786460e2120ce7d739a541c505..349f050865ef8639ca0c8ed7fd2955f4fc0f2dc0 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_sourcetrans_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 3185ed47979ae8aee8c4d0822d0e64a2a3009cfa..5c20474b3406156ee09fc7a2ea98106bb79e8078 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_trans_base") { include_dirs = [ + "${av_transport_path}/common/include", "include", "${common_path}/include", "${frameworks_path}/include", diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index 93124cd1f28c7a97d0d0a9b252bbb9b822009ce4..6d26de95938353f0c3a34d5234df1d7af58bd351 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_transbase_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${distributedinput_path}/services/source/transport/include", "${distributedinput_path}/services/sink/transport/include", "${distributedinput_path}/services/transportbase/include", diff --git a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn index 1522062ccf6443285430fc03a85cbe0ef0868dcc..c6d933a142f8fdb0a4b53d72e6c43deb13162370 100644 --- a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn @@ -24,6 +24,7 @@ ohos_fuzztest("DinputConfigDhFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputconfigdh_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "include", "${distributedinput_path}/interfaces/inner_kits/include", "${distributedinput_path}/interfaces/ipc/include", diff --git a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn index b68d614617720dc8d8e7954627582f962062b90d..e0218b838b74748f4ca0c2f18c0004dddfa40455 100644 --- a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn @@ -24,6 +24,7 @@ ohos_fuzztest("DinputInitSourceFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputinitsource_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "include", "${distributedinput_path}/interfaces/inner_kits/include", "${distributedinput_path}/interfaces/ipc/include", diff --git a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn index bfb54be9bd189ea2d4a99264c7c3f287ed291b26..48852523d5cf565fb162c079bfce6f85f9b9e188 100644 --- a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn +++ b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn @@ -24,6 +24,7 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") { "${distributedinput_path}/test/fuzztest/dinputreleasesource_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "include", "${distributedinput_path}/interfaces/inner_kits/include", "${distributedinput_path}/interfaces/ipc/include", diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index 2b56d4d892c180b711c88c918a44c830b700e1a5..a902db65db239b2e2e96c28e8414c55f2191afe1 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -25,6 +25,7 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${distributedinput_path}/test/fuzztest/distributedinputclient_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "include", "${distributedinput_path}/interfaces/inner_kits/include", "${distributedinput_path}/interfaces/ipc/include", diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index 4acb39d907e88f2e0c2569c34f614deb71ff4605..c1d9789d2ca25daf132405e40a3866cc261f0dda 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -24,6 +24,7 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputsinktransport_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "${services_sink_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index 26599cc433494f2b6beac81b5e5d9cf9f8be46e3..d5cea3b3dad61354172f25d75bc4fdf6db3653f0 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -24,6 +24,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputsourcetransport_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index 07339bccc8e36d54bfa9800d03d32bd464fda771..da8483e51ab51d91903cd7f6cdfd1097e00a36c1 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn @@ -24,6 +24,7 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") { fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputtransportbase_fuzzer" include_dirs = [ + "${av_transport_path}/common/include", "${services_source_path}/transport/include", "${distributedinput_path}/services/transportbase/include", "${common_path}/include", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 41f73c04c6d56dca1c1446a8c2fbf72085a7bdfb..e51dabb008fc53175e6b767b4b94fac7aa902a2b 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -17,6 +17,7 @@ import( ohos_shared_library("libdinput_utils") { include_dirs = [ + "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", "//third_party/json/include", diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index ae994b81b62907438563343f82a4abaded880eb9..983c60b84dbe497221d5958c899e4b8c6f6ebe5a 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -28,6 +28,7 @@ ohos_unittest("distributed_input_utils_test") { module_out_path = module_out_path include_dirs = [ + "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", "${fwk_common_path}/log/include", "${utils_path}/include",