diff --git a/bundle.json b/bundle.json
index bb98223786fd5cdea6724ad97980a1b5b3b1ce7f..0eb476210f4c4cdeaf294d67d386bfd546abe94d 100644
--- a/bundle.json
+++ b/bundle.json
@@ -32,6 +32,7 @@
                 "eventhandler",
                 "camera_framework",
                 "graphic_2d",
+                "graphic_surface",
                 "distributed_hardware_fwk",
                 "hdf_core",
                 "drivers_interface_display",
diff --git a/distributedcamera.gni b/distributedcamera.gni
index 29e824cba995e3215b71fa1490d2122ad24ce875..075c55cf0e16af444ab00749c8240cb16a8349c6 100644
--- a/distributedcamera.gni
+++ b/distributedcamera.gni
@@ -22,6 +22,8 @@ camerastandard_path = "//foundation/multimedia/camera_framework"
 
 graphicstandard_path = "//foundation/graphic/graphic_2d"
 
+graphicsurface_path = "//foundation/graphic/graphic_surface"
+
 common_path = "${distributedcamera_path}/common"
 
 services_path = "${distributedcamera_path}/services"
diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn
index 8cb378424ef323971d72457ebe363a99573b4738..61fabb96fa8732e6982c7454e87349fcb9ce8989 100644
--- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("EncodeOnInputBufferAvailableFuzzTest") {
   include_dirs = [
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${services_path}/cameraservice/base/include",
   ]
 
@@ -72,7 +72,7 @@ ohos_fuzztest("EncodeOnInputBufferAvailableFuzzTest") {
     "c_utils:utils",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 }
diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn
index 8f545edd9d72f197073c19629832a30f5dd81ba2..32721750d568769efcf3d7c9e933d6c349f79d3c 100644
--- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("EncodeOnOutputBufferAvailableFuzzTest") {
   include_dirs = [
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${services_path}/cameraservice/base/include",
   ]
 
@@ -72,7 +72,7 @@ ohos_fuzztest("EncodeOnOutputBufferAvailableFuzzTest") {
     "c_utils:utils",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 }
diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn
index 90cd852e6a9414eefd08550ee8e8a2d1113eca37..4a5f51819d73b351b60755d084baebb3a60085fb 100644
--- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("DecodeOnInputBufferAvailableFuzzTest") {
   include_dirs = [
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${services_path}/cameraservice/base/include",
   ]
 
@@ -71,7 +71,7 @@ ohos_fuzztest("DecodeOnInputBufferAvailableFuzzTest") {
     "av_codec:av_codec_client",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 }
diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn
index ac660830fde4192c85ea908a6d4da090b27db80c..c0d537b56ba2fa49363b173205eaa6784471f35d 100644
--- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("DecodeOnOutputBufferAvailableFuzzTest") {
   include_dirs = [
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${services_path}/cameraservice/base/include",
   ]
 
@@ -71,7 +71,7 @@ ohos_fuzztest("DecodeOnOutputBufferAvailableFuzzTest") {
     "av_codec:av_codec_client",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 }
diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn
index 0a19ff0dc51da367765498e0a5301ec36feedc15..5015beacd966468e8966b8ef282b6b7b330c8078 100644
--- a/services/cameraservice/cameraoperator/client/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/BUILD.gn
@@ -28,7 +28,7 @@ ohos_shared_library("distributed_camera_client") {
   }
   stack_protector_ret = true
   include_dirs = [
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -80,7 +80,7 @@ ohos_shared_library("distributed_camera_client") {
     "drivers_interface_camera:metadata",
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
   ]
 
diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn
index 328575b345c42d880b90000fabc0fc9b20dc20fb..5c53cfa42277824159ff75c555546aaf468ea0e8 100644
--- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn
@@ -20,7 +20,7 @@ config("module_private_config") {
   include_dirs = [
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -72,7 +72,6 @@ ohos_executable("dcamera_client_demo") {
     "${camerastandard_path}/frameworks/native/camera:camera_framework",
     "${common_path}:distributed_camera_utils",
     "${fwk_utils_path}:distributedhardwareutils",
-    "${graphicstandard_path}:libsurface",
     "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client",
     "${services_path}/cameraservice/sinkservice:distributed_camera_sink",
     "//third_party/cJSON:cjson",
@@ -90,6 +89,7 @@ ohos_executable("dcamera_client_demo") {
     "drivers_interface_camera:metadata",
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_core",
   ]
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 69e52120a342335f94e85e6c5e90180e72bfaacb..55a71f9c28019a54606cc78cbc86ba237716e500 100644
--- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
@@ -22,7 +22,7 @@ config("module_private_config") {
   include_dirs = [
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -59,7 +59,6 @@ ohos_unittest("DCameraClientTest") {
   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}/cameraservice/sinkservice:distributed_camera_sink",
@@ -78,6 +77,7 @@ ohos_unittest("DCameraClientTest") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn
index dc2cd24b11d769b28759443d18d22ba6b041aa3b..bbb974e7d3ffb0ac1a5cfd90d5df2dfde28b86ad 100644
--- a/services/cameraservice/cameraoperator/handler/BUILD.gn
+++ b/services/cameraservice/cameraoperator/handler/BUILD.gn
@@ -31,7 +31,7 @@ ohos_shared_library("distributed_camera_handler") {
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
     "//third_party/json/include",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -78,7 +78,7 @@ ohos_shared_library("distributed_camera_handler") {
     "drivers_interface_camera:metadata",
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
   ]
 
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 ddcce166cf2fbb812443339a8108b47bf6af5fff..33041dde95ad7a7d88ecd775bba63263e8479e98 100644
--- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn
+++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn
@@ -20,7 +20,7 @@ module_out_path = "distributed_camera/dcamera_handler_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -52,7 +52,6 @@ ohos_unittest("DCameraHandlerTest") {
   deps = [
     "${camerastandard_path}/frameworks/native/camera:camera_framework",
     "${common_path}:distributed_camera_utils",
-    "${graphicstandard_path}:libsurface",
     "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler",
     "//third_party/cJSON:cjson",
     "//third_party/googletest:gtest_main",
@@ -68,6 +67,7 @@ ohos_unittest("DCameraHandlerTest") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn
index 70885687a18beb6e937afb354a6b1985b047e1ca..9bc78bb90f381c3530485e3d8f54855d6ba3cdae 100644
--- a/services/cameraservice/sinkservice/BUILD.gn
+++ b/services/cameraservice/sinkservice/BUILD.gn
@@ -29,7 +29,7 @@ ohos_shared_library("distributed_camera_sink") {
   stack_protector_ret = true
   include_dirs = [
     "${av_transport_path}/common/include",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -123,7 +123,7 @@ ohos_shared_library("distributed_camera_sink") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn
index 7ba21cc673f1eb3843bebc4478cce485bff0bca5..9556f703ff9053c90fc46ae4af9771d515cfd193 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn
@@ -22,7 +22,7 @@ config("module_private_config") {
   include_dirs = [
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -60,7 +60,6 @@ ohos_unittest("DistributedCameraSinkServiceTest") {
   deps = [
     "${camerastandard_path}/frameworks/native/camera:camera_framework",
     "${common_path}:distributed_camera_utils",
-    "${graphicstandard_path}:libsurface",
     "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk",
     "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler",
     "${services_path}/cameraservice/sinkservice:distributed_camera_sink",
@@ -75,6 +74,7 @@ ohos_unittest("DistributedCameraSinkServiceTest") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
index 1e5933c89c1f2d0085c4551d9f27741197926dac..4d612349141006c74511b2e56fd86b89330a9dd2 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
@@ -20,7 +20,7 @@ module_out_path = "distributed_camera/dcamera_sink_mgr_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/output",
@@ -75,7 +75,6 @@ ohos_unittest("DCameraSinkMgrTest") {
   deps = [
     "${camerastandard_path}/frameworks/native/camera:camera_framework",
     "${common_path}:distributed_camera_utils",
-    "${graphicstandard_path}:libsurface",
     "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler",
     "${services_path}/cameraservice/sinkservice:distributed_camera_sink",
     "${services_path}/channel:distributed_camera_channel",
@@ -90,6 +89,7 @@ ohos_unittest("DCameraSinkMgrTest") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "drivers_peripheral_display:hdi_gralloc_client",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "ipc:ipc_core",
   ]
 
diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn
index 6f0c82e50334e0ba659b3e589beeb43fef9a632a..443aa271cdacb27d54758dae8f3b42190cd2822b 100644
--- a/services/cameraservice/sourceservice/BUILD.gn
+++ b/services/cameraservice/sourceservice/BUILD.gn
@@ -58,7 +58,7 @@ ohos_shared_library("distributed_camera_source") {
     "${services_path}/data_process/include/interfaces",
     "${services_path}/data_process/include/pipeline",
     "${services_path}/data_process/include/utils",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${fwk_common_path}/utils/include",
     "${fwk_innerkits_path}/include",
   ]
@@ -121,7 +121,7 @@ ohos_shared_library("distributed_camera_source") {
     "c_utils:utils",
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hdf_core:libhdi",
     "hdf_core:libpub_utils",
     "hitrace:hitrace_meter",
diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
index f079e28231e5b1c5b9bad271d2c6f8f7cb5167b9..9e74996baaf1abdcab829461f052451105d9d387 100644
--- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
+++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
@@ -47,7 +47,7 @@ config("module_private_config") {
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
     "//drivers/peripheral/base/",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
   ]
 }
 
@@ -66,7 +66,6 @@ ohos_unittest("DCameraSourceTest") {
 
   deps = [
     "${common_path}:distributed_camera_utils",
-    "${graphicstandard_path}:libsurface",
     "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk",
     "${services_path}/cameraservice/sourceservice:distributed_camera_source",
     "${services_path}/channel:distributed_camera_channel",
@@ -80,6 +79,7 @@ ohos_unittest("DCameraSourceTest") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
index 4ff940092ea7ded6553cbbac6cb06d342c43c58a..177326dc22dcbd2d88485145055cbdcda5372886 100644
--- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
+++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
@@ -47,7 +47,7 @@ config("module_private_config") {
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
     "//drivers/peripheral/base/",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${feeding_smoother_path}",
     "${feeding_smoother_path}/base",
     "${feeding_smoother_path}/derived",
@@ -77,7 +77,6 @@ ohos_unittest("DCameraSourceMgrTest") {
 
   deps = [
     "${common_path}:distributed_camera_utils",
-    "${graphicstandard_path}:libsurface",
     "${services_path}/cameraservice/sourceservice:distributed_camera_source",
     "${services_path}/channel:distributed_camera_channel",
     "${services_path}/data_process:distributed_camera_data_process",
@@ -94,6 +93,7 @@ ohos_unittest("DCameraSourceMgrTest") {
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "hdf_core:libhdi",
     "hilog:libhilog",
     "ipc:ipc_core",
diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn
index b5d17d89b6339cc75eb26b8360b35080425ccd28..5e04022e2fcf272b53919ece1bf8f285b095c08e 100644
--- a/services/channel/test/unittest/common/channel/BUILD.gn
+++ b/services/channel/test/unittest/common/channel/BUILD.gn
@@ -47,7 +47,7 @@ config("module_private_config") {
     "${services_path}/data_process/include/utils",
     "${innerkits_path}/native_cpp/camera_source/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "//third_party/cJSON",
     "//third_party/jsoncpp/include",
     "${feeding_smoother_path}/base",
@@ -77,7 +77,6 @@ ohos_unittest("DCameraChannelTest") {
 
   deps = [
     "${common_path}:distributed_camera_utils",
-    "${graphicstandard_path}:libsurface",
     "${services_path}/cameraservice/sinkservice:distributed_camera_sink",
     "${services_path}/cameraservice/sourceservice:distributed_camera_source",
     "${services_path}/data_process:distributed_camera_data_process",
@@ -89,6 +88,7 @@ ohos_unittest("DCameraChannelTest") {
     "c_utils:utils",
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
     "eventhandler:libeventhandler",
+    "graphic_surface:surface",
     "hdf_core:libhdi",
   ]
 
diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn
index e30527c6f7308caf068a3baa45f597a3849128e1..566284afbddf3ddba8bd3f88997145c960696d01 100644
--- a/services/data_process/BUILD.gn
+++ b/services/data_process/BUILD.gn
@@ -30,7 +30,7 @@ ohos_shared_library("distributed_camera_data_process") {
   include_dirs = [
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
-    "${graphicstandard_path}/frameworks/surface/include",
+    "${graphicsurface_path}/surface/include",
     "${services_path}/cameraservice/base/include",
   ]
 
@@ -102,7 +102,7 @@ ohos_shared_library("distributed_camera_data_process") {
     "c_utils:utils",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 
diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn
index 12dde8836b90c668e6b6a4448c67213add080669..3c334c2fcde35e10d5f5a1702c3d6b67b4944152 100644
--- a/services/data_process/test/unittest/common/pipeline/BUILD.gn
+++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn
@@ -59,7 +59,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") {
     "av_codec:av_codec_client",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 
diff --git a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn
index 26de7b6d8706e2ebda7b541d94acf9c2502fba28..21dcabd72e4659ae61dd5477ed333ad81190b473 100644
--- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn
+++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn
@@ -72,7 +72,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") {
     "c_utils:utils",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "eventhandler:libeventhandler",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hitrace:hitrace_meter",
   ]
 
diff --git a/test/distributedcameraclienttest/BUILD.gn b/test/distributedcameraclienttest/BUILD.gn
index 608bba7fb27719cccf3cfd57b53df544c104c793..169c09cbaca9d403e4526df0762bc95bd0afaf77 100644
--- a/test/distributedcameraclienttest/BUILD.gn
+++ b/test/distributedcameraclienttest/BUILD.gn
@@ -66,7 +66,7 @@ ohos_moduletest_suite("SubDctsdisCameraClientTest") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "drivers_interface_camera:metadata",
     "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0",
-    "graphic_2d:surface",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_core",
   ]