From 171bc41f960edfa87a30b43a3dde330d77e59e0a Mon Sep 17 00:00:00 2001 From: wangchaole Date: Tue, 7 Jun 2022 09:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangchaole --- README_zh.md | 2 +- bundle.json | 54 +++++++++---------- camera_hdf/hdi_impl/BUILD.gn | 2 +- .../dcamera_device/dmetadata_processor.h | 2 +- .../include/dcamera_host/dcamera_host.h | 2 +- .../include/dstream_operator/dcamera_steam.h | 2 +- camera_hdf/hdi_impl/include/utils/dcamera.h | 2 +- camera_hdf/hdi_impl/test/BUILD.gn | 2 +- camera_hdf/hdi_impl/test/common.h | 2 +- camera_hdf/interfaces/hdi_ipc/client/BUILD.gn | 2 +- .../interfaces/hdi_ipc/config/host/BUILD.gn | 2 +- .../hdi_ipc/config/provider/BUILD.gn | 2 +- .../interfaces/hdi_ipc/ipc_data_utils.h | 2 +- common/BUILD.gn | 2 +- distributedcamera.gni | 2 +- .../native_cpp/camera_sink/BUILD.gn | 2 +- .../native_cpp/camera_source/BUILD.gn | 2 +- .../dcamerasinkhandleripc_fuzzer/BUILD.gn | 2 +- .../dcamerasinkloadcallback_fuzzer/BUILD.gn | 2 +- .../fuzztest/dcamerasinkproxy_fuzzer/BUILD.gn | 2 +- .../dcamerasourcehandleripc_fuzzer/BUILD.gn | 2 +- .../dcamerasourceloadcallback_fuzzer/BUILD.gn | 2 +- .../unittest/common/dcameraprotocol/BUILD.gn | 2 +- .../cameraoperator/client/BUILD.gn | 2 +- .../unittest/common/cameraoperator/BUILD.gn | 2 +- .../cameraoperator/handler/BUILD.gn | 2 +- .../unittest/common/dcamerahandler/BUILD.gn | 2 +- services/cameraservice/sinkservice/BUILD.gn | 2 +- .../common/distributedcamera/BUILD.gn | 2 +- .../common/distributedcameramgr/BUILD.gn | 2 +- services/cameraservice/sourceservice/BUILD.gn | 2 +- .../common/distributedcameramgr/BUILD.gn | 2 +- services/channel/BUILD.gn | 2 +- services/data_process/BUILD.gn | 2 +- 34 files changed, 60 insertions(+), 60 deletions(-) diff --git a/README_zh.md b/README_zh.md index 307f978..fba3d37 100644 --- a/README_zh.md +++ b/README_zh.md @@ -25,7 +25,7 @@ ## **目录** ``` -/foundation/distributedhardware/distributedcamera +/foundation/distributedhardware/distributed_camera ├── camera_hdf # 分布式相机HAL功能 ├── common # 分布式相机公共模块 ├── interfaces # 分布式相机对外接口模块 diff --git a/bundle.json b/bundle.json index 32f245f..7444683 100644 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "license":"Apache License 2.0", "publishAs":"code-segment", "segment":{ - "destPath":"foundation/distributedhardware/distributedcamera/" + "destPath":"foundation/distributedhardware/distributed_camera/" }, "dirs":{}, "scripts":{}, @@ -24,7 +24,7 @@ "rom":"2000k", "ram":"6M", "hisysevent_config": [ - "//foundation/distributedhardware/distributedcamera/hisysevent.yaml" + "//foundation/distributedhardware/distributed_camera/hisysevent.yaml" ], "deps":{ "components":[ @@ -50,28 +50,28 @@ }, "build":{ "sub_component":[ - "//foundation/distributedhardware/distributedcamera/common:distributed_camera_utils", - "//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk", - "//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/client:distributed_camera_client", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/handler:distributed_camera_handler", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/sinkservice:distributed_camera_sink", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/sourceservice:distributed_camera_source", - "//foundation/distributedhardware/distributedcamera/services/data_process:distributed_camera_data_process", - "//foundation/distributedhardware/distributedcamera/sa_profile:dcamera_sa_profile", - "//foundation/distributedhardware/distributedcamera/sa_profile:dcamera.cfg", - "//foundation/distributedhardware/distributedcamera/services/channel:distributed_camera_channel", - "//foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/hdi_ipc/config/host:distributed_camera_host_config", - "//foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/hdi_ipc/config/provider:distributed_camera_provider_config", - "//foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/hdi_ipc/client:distributed_camera_hdf_client", - "//foundation/distributedhardware/distributedcamera/camera_hdf/hdi_impl:distributed_camera_hdf" + "//foundation/distributedhardware/distributed_camera/common:distributed_camera_utils", + "//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk", + "//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/client:distributed_camera_client", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/handler:distributed_camera_handler", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/sinkservice:distributed_camera_sink", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/sourceservice:distributed_camera_source", + "//foundation/distributedhardware/distributed_camera/services/data_process:distributed_camera_data_process", + "//foundation/distributedhardware/distributed_camera/sa_profile:dcamera_sa_profile", + "//foundation/distributedhardware/distributed_camera/sa_profile:dcamera.cfg", + "//foundation/distributedhardware/distributed_camera/services/channel:distributed_camera_channel", + "//foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/hdi_ipc/config/host:distributed_camera_host_config", + "//foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/hdi_ipc/config/provider:distributed_camera_provider_config", + "//foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/hdi_ipc/client:distributed_camera_hdf_client", + "//foundation/distributedhardware/distributed_camera/camera_hdf/hdi_impl:distributed_camera_hdf" ], "inner_kits":[ { "type":"so", - "name":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk", + "name":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_sink:distributed_camera_sink_sdk", "header":{ - "header_base":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_sink/include", + "header_base":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_sink/include", "header_files":[ "idistributed_camera_sink.h" ] @@ -79,9 +79,9 @@ }, { "type":"so", - "name":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk", + "name":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_source:distributed_camera_source_sdk", "header":{ - "header_base":"//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/camera_source/include", + "header_base":"//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/camera_source/include", "header_files":[ "idistributed_camera_source.h" ] @@ -89,12 +89,12 @@ } ], "test":[ - "//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/client/test/unittest:camera_client_test", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/handler/test/unittest:camera_handler_test", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/sinkservice/test/unittest:sink_service_test", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/sourceservice/test/unittest:source_service_test", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/base/test/unittest:services_base_test", - "//foundation/distributedhardware/distributedcamera/interfaces/inner_kits/native_cpp/test/fuzztest:fuzztest" + "//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/client/test/unittest:camera_client_test", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/cameraoperator/handler/test/unittest:camera_handler_test", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/sinkservice/test/unittest:sink_service_test", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/sourceservice/test/unittest:source_service_test", + "//foundation/distributedhardware/distributed_camera/services/cameraservice/base/test/unittest:services_base_test", + "//foundation/distributedhardware/distributed_camera/interfaces/inner_kits/native_cpp/test/fuzztest:fuzztest" ] } } diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index 503f54c..000f3e0 100644 --- a/camera_hdf/hdi_impl/BUILD.gn +++ b/camera_hdf/hdi_impl/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_hdf") { include_dirs = [ diff --git a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h index 56639aa..a230edd 100644 --- a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h +++ b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h @@ -22,7 +22,7 @@ #include "constants.h" #include "dcamera.h" -#include +#include #include namespace OHOS { diff --git a/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h b/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h index a19a8ac..9432d1a 100644 --- a/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h +++ b/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h @@ -22,7 +22,7 @@ #include "icamera_host_callback.h" #include "icamera_device_callback.h" -#include +#include #include namespace OHOS { diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h b/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h index 0b7002f..59d56e2 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h @@ -20,7 +20,7 @@ #include "dimage_buffer.h" #include "dbuffer_manager.h" -#include +#include #include namespace OHOS { diff --git a/camera_hdf/hdi_impl/include/utils/dcamera.h b/camera_hdf/hdi_impl/include/utils/dcamera.h index 48fb73a..6d67907 100644 --- a/camera_hdf/hdi_impl/include/utils/dcamera.h +++ b/camera_hdf/hdi_impl/include/utils/dcamera.h @@ -16,7 +16,7 @@ #ifndef DISTRIBUTED_CAMERA_H #define DISTRIBUTED_CAMERA_H -#include +#include #include namespace OHOS { diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn index 207a17b..41d9a8e 100644 --- a/camera_hdf/hdi_impl/test/BUILD.gn +++ b/camera_hdf/hdi_impl/test/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_executable("dcamera_hdi_sample") { install_enable = false diff --git a/camera_hdf/hdi_impl/test/common.h b/camera_hdf/hdi_impl/test/common.h index 43d8324..03ebfda 100644 --- a/camera_hdf/hdi_impl/test/common.h +++ b/camera_hdf/hdi_impl/test/common.h @@ -34,7 +34,7 @@ #include "display_type.h" #include "distributed_hardware_log.h" #include "drivers/peripheral/camera/interfaces/include/types.h" -#include "foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h" +#include "foundation/distributedhardware/distributed_camera/camera_hdf/interfaces/include/types.h" #include "icamera_device.h" #include "icamera_host.h" #include "idistributed_hardware_source.h" diff --git a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn index 893983d..6558bdd 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_hdf_client") { include_dirs = [ diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn index 58ab3a1..49703c2 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_host_config") { include_dirs = [ diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn index b1b0888..fa2528d 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_provider_config") { include_dirs = [ diff --git a/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h b/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h index a84b499..ee8b9e1 100644 --- a/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h +++ b/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h @@ -24,7 +24,7 @@ #include #include "camera_metadata_info.h" -#include +#include #include namespace OHOS { diff --git a/common/BUILD.gn b/common/BUILD.gn index 9d8df6c..c8fdcf7 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_utils") { include_dirs = [ diff --git a/distributedcamera.gni b/distributedcamera.gni index 245178d..cabce39 100644 --- a/distributedcamera.gni +++ b/distributedcamera.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -distributedcamera_path = "//foundation/distributedhardware/distributedcamera" +distributedcamera_path = "//foundation/distributedhardware/distributed_camera" distributedhardwarefwk_path = "//foundation/distributedhardware/distributedhardwarefwk" diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 2dddd28..08504b1 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_sink_sdk") { include_dirs = [ diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 93660d6..756242d 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_source_sdk") { include_dirs = [ diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkhandleripc_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkhandleripc_fuzzer/BUILD.gn index 747a76d..32b8530 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkhandleripc_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkhandleripc_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## ohos_fuzztest("DCameraSinkHandlerIpcFuzzTest") { diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkloadcallback_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkloadcallback_fuzzer/BUILD.gn index a797f44..3b9dd8c 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkloadcallback_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkloadcallback_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## ohos_fuzztest("DCameraSinkLoadCallbackFuzzTest") { diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkproxy_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkproxy_fuzzer/BUILD.gn index 8533427..25fc2d2 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkproxy_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasinkproxy_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## ohos_fuzztest("DCameraSinkProxyFuzzTest") { diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourcehandleripc_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourcehandleripc_fuzzer/BUILD.gn index 637c2d8..8243642 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourcehandleripc_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourcehandleripc_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## ohos_fuzztest("DCameraSourceHandlerIpcFuzzTest") { diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourceloadcallback_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourceloadcallback_fuzzer/BUILD.gn index 61b9eb7..972f3cb 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourceloadcallback_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/dcamerasourceloadcallback_fuzzer/BUILD.gn @@ -15,7 +15,7 @@ import("//build/config/features.gni") import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## ohos_fuzztest("DCameraSourceLoadCallbackFuzzTest") { diff --git a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn index e8be668..48ab6a8 100644 --- a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") module_out_path = "distributed_camera/dcamera_protocol_test" diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 8bc4f66..edbe2c5 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_client") { include_dirs = [ diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index 7d6f4c6..2d7e086 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") module_out_path = "distributed_camera/dcamera_client_test" diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 601f0ea..097e0a0 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_handler") { include_dirs = [ diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn index 2c85f11..26c041c 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") module_out_path = "distributed_camera/dcamera_handler_test" diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index c3a5fb7..0d81af9 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_sink") { include_dirs = [ diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 186708d..4f10a42 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") module_out_path = "distributed_camera/dcamera_sink_test" diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 36fc233..6bfd966 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") module_out_path = "distributed_camera/dcamera_sink_mgr_test" diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index ad111a6..0449bf6 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_source") { include_dirs = [ diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index f341b97..8cf06cf 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") module_out_path = "distributed_camera/dcamera_source_mgr_test" diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 3e263e0..f672919 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_channel") { include_dirs = [ diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index cac352d..2712354 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") import( - "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ohos_shared_library("distributed_camera_data_process") { include_dirs = [