From 77db80c9b225cc5b4154f7efdad188cb7bdb570a Mon Sep 17 00:00:00 2001
From: renguang1116 <renguang@huawei.com>
Date: Sat, 17 Jun 2023 14:44:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=20Signed-off-by:=20renguang1116=20<renguang@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 distributedinput.gni                   | 2 ++
 services/sink/sinkmanager/BUILD.gn     | 1 +
 services/sink/transport/BUILD.gn       | 1 +
 services/source/sourcemanager/BUILD.gn | 1 +
 services/source/transport/BUILD.gn     | 1 +
 services/transportbase/BUILD.gn        | 1 +
 utils/BUILD.gn                         | 1 +
 7 files changed, 8 insertions(+)

diff --git a/distributedinput.gni b/distributedinput.gni
index 907f309..2af072d 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/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn
index bb291cd..6e097cc 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/transport/BUILD.gn b/services/sink/transport/BUILD.gn
index ef0d374..7006637 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/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn
index ee07602..bc0f6cc 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/transport/BUILD.gn b/services/source/transport/BUILD.gn
index 9359c14..5d1a8ea 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/transportbase/BUILD.gn b/services/transportbase/BUILD.gn
index 3185ed4..5c20474 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/utils/BUILD.gn b/utils/BUILD.gn
index 41f73c0..e51dabb 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",
-- 
Gitee


From 0c9784ecaf459ff01d4b14733fbd9c568c4f7844 Mon Sep 17 00:00:00 2001
From: renguang1116 <renguang@huawei.com>
Date: Mon, 19 Jun 2023 15:10:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=20Signed-off-by:=20renguang1116=20<renguang@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inputdevicehandler/BUILD.gn                                      | 1 +
 inputdevicehandler/test/inputhandlertest/BUILD.gn                | 1 +
 interfaces/inner_kits/BUILD.gn                                   | 1 +
 interfaces/inner_kits/test/unittest/BUILD.gn                     | 1 +
 interfaces/ipc/test/clientunittest/BUILD.gn                      | 1 +
 interfaces/ipc/test/ipcunittest/BUILD.gn                         | 1 +
 services/sink/inputcollector/BUILD.gn                            | 1 +
 services/sink/inputcollector/test/sinkcollectorunittest/BUILD.gn | 1 +
 services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn      | 1 +
 services/source/inputinject/BUILD.gn                             | 1 +
 services/source/inputinject/test/sourceinjectunittest/BUILD.gn   | 1 +
 .../source/sourcemanager/test/sourcemanagerunittest/BUILD.gn     | 1 +
 12 files changed, 12 insertions(+)

diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn
index 3349e1e..53a5bc6 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 bfbfe78..be88283 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 740bd29..8bb8c1f 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 535807d..c8ca062 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 635a243..c380c12 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 0d85953..8f0d33b 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 b5c5413..6e18351 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 d02da9f..286653c 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/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn
index 4dac2b3..2a1db13 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/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn
index 8d1a8a6..34e49dd 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 a0a847a..d0ad852 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/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn
index 2b43fac..635b269 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",
-- 
Gitee


From 9be2782f85e7771fae5694b18a78b237d926a5df Mon Sep 17 00:00:00 2001
From: renguang1116 <renguang@huawei.com>
Date: Tue, 20 Jun 2023 10:12:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E3=80=91=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=E6=A1=86=E6=9E=B6=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B4=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=20Signed-off-by:=20renguang1116=20<renguang@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/sink/transport/test/sinktransunittest/BUILD.gn       | 1 +
 services/source/transport/test/sourcetransunittest/BUILD.gn   | 1 +
 services/transportbase/test/transbaseunittest/BUILD.gn        | 1 +
 test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn                  | 1 +
 test/fuzztest/dinputinitsource_fuzzer/BUILD.gn                | 1 +
 test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn             | 1 +
 test/fuzztest/distributedinputclient_fuzzer/BUILD.gn          | 1 +
 test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn   | 1 +
 test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn | 1 +
 test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn   | 1 +
 utils/test/unittest/BUILD.gn                                  | 1 +
 11 files changed, 11 insertions(+)

diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn
index 94ce8a5..40c3c60 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/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn
index ab1c3ef..349f050 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/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn
index 93124cd..6d26de9 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 1522062..c6d933a 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 b68d614..e0218b8 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 bfb54be..4885252 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 2b56d4d..a902db6 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 4acb39d..c1d9789 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 26599cc..d5cea3b 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 07339bc..da8483e 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/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn
index ae994b8..983c60b 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",
-- 
Gitee