diff --git a/bundle.json b/bundle.json index 5cff89c4169580100f9ce8dd3cb35a01665229b9..958d4e38d39286f11ea71944857c289ea9d7abf1 100644 --- a/bundle.json +++ b/bundle.json @@ -44,12 +44,13 @@ "samgr", "hitrace_native", "safwk", - "driver_interface_camera", + "drivers_interface_camera", "access_token" ], "third_party":[ "ffmpeg", - "jsoncpp" + "jsoncpp", + "libyuv" ] }, "build":{ diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index fe8cdd19e52dff62b610e04810ff1344f4da87a5..7fd4ea5e4136751d7e22c26c0d45e19ea910f8cb 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -54,11 +54,7 @@ ohos_shared_library("distributed_camera_client") { sources += [ "src/dcamera_client.cpp" ] - deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${common_path}:distributed_camera_utils", - "${graphicstandard_path}:libsurface", - ] + deps = [ "${common_path}:distributed_camera_utils" ] defines = [ "HI_LOG_ENABLE", @@ -68,9 +64,11 @@ ohos_shared_library("distributed_camera_client") { external_deps = [ "c_utils:utils", + "camera_framework:camera_framework", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "graphic_standard:surface", "ipc:ipc_core", ] diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 5ead570f1bb67d5c7f46cd169a9cf1fc4feb806f..2b92fa40d71a1d59498944fbdf3d530b14b0fe72 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -49,9 +49,7 @@ ohos_shared_library("distributed_camera_handler") { } deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", - "${graphicstandard_path}:libsurface", "//third_party/jsoncpp:jsoncpp", ] @@ -63,8 +61,10 @@ ohos_shared_library("distributed_camera_handler") { external_deps = [ "c_utils:utils", + "camera_framework:camera_framework", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "graphic_standard:surface", "ipc:ipc_core", "player_framework:media_client", ] diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 9cb7e978684288fdd96061935fd08de2c385b2aa..c9b20244993718497b6102dc02429217d0b9bb72 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -91,9 +91,7 @@ ohos_shared_library("distributed_camera_sink") { ] deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", - "${graphicstandard_path}:libsurface", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/channel:distributed_camera_channel", @@ -109,8 +107,10 @@ ohos_shared_library("distributed_camera_sink") { external_deps = [ "c_utils:utils", + "camera_framework:camera_framework", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", + "graphic_standard:surface", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 710ff0de27fa7d2dfe50118ec7d8fac21cc07350..1834d4b7d0a6b1f837ed2b75115be9417fc0d1fd 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -94,7 +94,6 @@ ohos_shared_library("distributed_camera_source") { deps = [ "${common_path}:distributed_camera_utils", - "${graphicstandard_path}:libsurface", "${services_path}/channel:distributed_camera_channel", "${services_path}/data_process:distributed_camera_data_process", "//third_party/jsoncpp:jsoncpp", @@ -110,6 +109,7 @@ ohos_shared_library("distributed_camera_source") { "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", + "graphic_standard:surface", "hdf_core:libhdi", "hdf_core:libpub_utils", "hitrace_native:hitrace_meter", diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 25d31d504fcdb078c500045eab7a2e59dd3bfd93..c895a1b45538d85d71ffb40bb15ffcf763833bd8 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -44,10 +44,7 @@ ohos_shared_library("distributed_camera_channel") { "src/dcamera_softbus_session.cpp", ] - deps = [ - "${common_path}:distributed_camera_utils", - "${fwk_innerkits_path}:libdhfwk_sdk", - ] + deps = [ "${common_path}:distributed_camera_utils" ] defines = [ "HI_LOG_ENABLE", @@ -57,6 +54,7 @@ ohos_shared_library("distributed_camera_channel") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", ]