diff --git a/README_zh.md b/README_zh.md index 307f978870afb6bb25cb36ce3e42bd9bb77844f1..fba3d37b673947e98fdd711be2db49a28265419f 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 32f245fce365416503b6b46a4fb722cc62df46d5..74446837a5c7dc6d9f0dcba2b2725be58e40f8a7 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 503f54ce1cfd341e38acb553b5979600be1cffa5..000f3e0b9b698c849bef7633f61a5b53336faef3 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 56639aaab6b50615cfe257a954b02990ad486fee..a230edde8f02f4ede8b4f897460d0953d05b9934 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 a19a8accded7c5ec4457b67d46e465b9b7aa2618..9432d1a587010ec708ed52fc6995254264994f7c 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 0b7002f6f092744b6ac4def789f88b6aa0419c84..59d56e2443e067bfc4f84160e24b0cc84d55f809 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 48fb73adb4c9275d1d842378a3ea89121a74451f..6d67907bc5fd9adabecee6a4eeec0918b6853ca1 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 207a17b4140cc28dae7b4ab173ff68c2241b0481..41d9a8e67fbc4f97871a11e2f2490ce87b659672 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 43d8324a4bc8af89d11b4bfb9b2e7a9a6dd98176..03ebfda3023c857b2a536b5dc32bde0fab695de1 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 893983d87f5f39272bfd6b246057da3af2820676..6558bddf5f2f339875627cbb86155ad3c627f8c5 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 58ab3a1727409a178bebfcfeaf32d92f64ea9704..49703c2bf4c9803a3a7bd1c5a0890685858ff4c4 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 b1b08882ef5931c2e10a24d1e321c5de38640b09..fa2528db756e2e3697037f15d86a2c520d1e8f03 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 a84b4998affcaa5476ffdeca100f23d055f347a2..ee8b9e10cf56e943545807b3afbb972bf1d39140 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 9d8df6c0ba3df2adacd89c0633fe59768d042aa1..c8fdcf7f0ccff2c70d029346f383645d8c0da534 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 245178df5f0d5967c418835b8b5732f75d036ec1..cabce397505bf4044b23b8c0d674568a8080bb52 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 2dddd282bdbd5eeac2437c09ed8849698f32888a..08504b1b7e4b829978e98fbf094df006c46e6d65 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 93660d65a7c96f8b7294930ca3f2864bb7827ab3..756242d97d1765544c214514984528bc7bf52740 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 747a76d40db6472414be2b51939510cde4e22a72..32b85305279ee16aeaa4404decc9dbe5124a2ebe 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 a797f4485bf9dcbda5d464d056f09f17bc28fe6b..3b9dd8c11d57d579522a9dbff76bd004db1a26a5 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 853342744ea527071a4ed139dd5da9bcfa110f2b..25fc2d28954ca49ab8024c434b0ce1cda16a9105 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 637c2d87a13540235d6d8144b3e1df529e74398e..82436427ff4fa5405abbae2bff44064d9d7cb066 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 61b9eb72068d2c5c5b146ccfadb822c4349fc4b0..972f3cb1f4eee2378057d20aa9e4c044489f1085 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 e8be668c1974c1af74de52d4f797023c296aeb1c..48ab6a8fefa14a43a9ba1704b22f1471f5d8a0e4 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 8bc4f661497e28b0f1ff7df5c6fb5ef02ad44c49..edbe2c5048231012edf3f4b554d6e941b3c56972 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 7d6f4c6b67146deff0fc26fd701a44b18b4c66ef..2d7e086d17dc74a35f54ea75944bad176a2cab57 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 601f0ead11d820ab6c2d3c8b6bd99e12e71cf0f8..097e0a0453ac14a352f482075c04c59bea755a10 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 2c85f11b0633db95abb216b5b959a8b4716d361c..26c041cd15c6dbd299f971a2782fe787a93555c1 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 c3a5fb7a80659b8e45aa696f662599dbc4e51e4c..0d81af9b9737191d24006014df7830dfa2ce902a 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 186708d02a150b3909d9ec1d0eb5261207b1203a..4f10a427ca77098b238e179c66829c15d9a5e5dc 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 36fc23344ac6ff6f1789d9e5f866d14db14c5818..6bfd966bad674912d208b89373343a470a030da0 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 ad111a6fcb09a915a669578ee441f85658bcfead..0449bf6c2adca157b7508af19913ee3b5a68d16e 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 f341b973e472263a1f8d479a9cfd2153cfaaf682..8cf06cf991f13b5790ed27a6fcd4e68f1f6a9caa 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 3e263e0433f43ccd8a9c7c39990cb1d2eaddb23d..f672919e0d2682752195d1d7371b8876d3361820 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 cac352d384986535f00f6b4619f8a7d9541915a4..27123548f5805f52b30652ac1e17d9df84807676 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 = [