diff --git a/distributedscreen.gni b/distributedscreen.gni
index c296f4cf64782ac09f93cebda27200582668cd4b..b17f27a67a079d0abae93e684fa197e37051b4ae 100644
--- a/distributedscreen.gni
+++ b/distributedscreen.gni
@@ -16,7 +16,7 @@ distributedhardwarefwk_path =
     "//foundation/distributedhardware/distributedhardwarefwk"
 windowmanager_path = "//foundation/windowmanager"
 mediastandard_path = "//foundation/multimedia/media_standard"
-graphicstandard_path = "//foundation/graphic/graphic"
+graphicstandard_path = "//foundation/graphic/graphic_2d"
 common_path = "${distributedscreen_path}/common"
 services_path = "${distributedscreen_path}/services"
 interfaces_path = "${distributedscreen_path}/interfaces"
diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn
index 29eac1822e0c884f7fa3cc2dc311851144fa78b9..b98495045391c626edd347d35bd6020fcb9844f9 100644
--- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn
@@ -21,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include",
   ]
diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn
index 4be676ffbfe1b94dd2c167237c143c352de93b4f..5bedfece7e3e041e26fe0c2b87f96e1a450a964b 100644
--- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn
+++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn
@@ -21,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include",
   ]
diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn
index b079cf109696e5fc3df17a9863414887147ce337..3927266389f770db48f0b245dbaaadbea074fc59 100644
--- a/screenhandler/BUILD.gn
+++ b/screenhandler/BUILD.gn
@@ -36,7 +36,7 @@ ohos_shared_library("distributed_screen_handler") {
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//utils/native/base:utils",
   ]
 
diff --git a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn
index 115d0e5a92dde4f94c827869514785864b151605..0b37ed8e78f8b3048d2bcd1313be220a9037763b 100644
--- a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn
@@ -54,7 +54,7 @@ ohos_fuzztest("DscreenHandlerFuzzTest") {
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn
index 68dab59184efaa3fa12badb3a94a198d83207585..b327c968c100c218cc52ccb3039e8f843b264265 100644
--- a/services/screenclient/BUILD.gn
+++ b/services/screenclient/BUILD.gn
@@ -40,7 +40,7 @@ ohos_shared_library("distributed_screen_client") {
     "${graphicstandard_path}/frameworks/surface:surface",
     "${windowmanager_path}/wm:libwm",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
   ]
 
   defines = [
diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn
index 99bed633f2f9e9709ad502932c24b8ca363bdc6e..6849e2e5fa80effcc6e4c78b43ed2ec71b84180d 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -21,7 +21,7 @@ ohos_shared_library("distributed_screen_sink") {
     "//third_party/json/include",
     "//utils/native/base/include",
     "//utils/system/safwk/native/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${windowmanager_path}/interfaces/innerkits/dm",
     "${fwk_common_path}/utils/include",
   ]
@@ -59,7 +59,7 @@ ohos_shared_library("distributed_screen_sink") {
     "${services_path}/screenclient:distributed_screen_client",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn
index 6da772f6d1ae8d18af076d4cdcf13529c425fa0a..7421c70638ee0ccebc0fd2caa8e34a3842c36194 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -22,7 +22,7 @@ ohos_shared_library("distributed_screen_source") {
     "${windowmanager_path}/interfaces/innerkits/dm",
     "//utils/native/base/include",
     "//utils/system/safwk/native/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${mediastandard_path}/interfaces/inner_api/native",
   ]
@@ -62,8 +62,8 @@ ohos_shared_library("distributed_screen_source") {
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
-    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn
index 4afcdbc643d1a6bd89a50148209f7a02b98daacf..44d8fcd4e006d3a662eca104b2839e285dfdfa8b 100644
--- a/services/screentransport/screensinktrans/BUILD.gn
+++ b/services/screentransport/screensinktrans/BUILD.gn
@@ -19,7 +19,7 @@ import(
 ohos_shared_library("distributed_screen_sinktrans") {
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -49,7 +49,7 @@ ohos_shared_library("distributed_screen_sinktrans") {
 
   deps = [
     "${common_path}:distributed_screen_utils",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn
index b5860b99014236e23da5380c67f2426a057e3ed6..7bd0d85972c57a4fbb8cd2e5bc4e3d40040279a6 100644
--- a/services/screentransport/screensourcetrans/BUILD.gn
+++ b/services/screentransport/screensourcetrans/BUILD.gn
@@ -19,7 +19,7 @@ import(
 ohos_shared_library("distributed_screen_sourcetrans") {
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -48,7 +48,7 @@ ohos_shared_library("distributed_screen_sourcetrans") {
 
   deps = [
     "${common_path}:distributed_screen_utils",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn
index 919d8dcb63686615395b91a41693d1357e9cc2e6..3e2f845437a7c6ccac679ef7595416b5b2a6441d 100644
--- a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenDataChannelFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -59,7 +59,7 @@ ohos_fuzztest("ScreenDataChannelFuzzTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn
index 230759f934058a24043853fa1ec96bf2cea70809..d034995337cc7862e7db37252fe1970775301748 100644
--- a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn
@@ -25,7 +25,7 @@ ohos_fuzztest("ScreenSinkProcessorFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -57,7 +57,7 @@ ohos_fuzztest("ScreenSinkProcessorFuzzTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn
index b4334b0f47db4701fe9ae56e04f61e0878067271..d1436379f65a32d2107696247f45c89bef5c38c3 100644
--- a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenSinkTransFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -59,7 +59,7 @@ ohos_fuzztest("ScreenSinkTransFuzzTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screenservice/sinkservice:distributed_screen_sink",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn
index 2416f88efd7366bef0cd61357b96c75bdd931400..3682283c601456611c6f35992c147a26234e0776 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn
@@ -25,7 +25,7 @@ ohos_fuzztest("ScreenSourceProcessorFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -58,7 +58,7 @@ ohos_fuzztest("ScreenSourceProcessorFuzzTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn
index 074ffc9412d859c76424abbb51b5bfc3002998b5..60deaaa8b4c86e4ef5f7b1b773d4b7f9ee04067e 100644
--- a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${windowmanager_path}/interfaces/innerkits/dm",
     "${fwk_common_path}/log/include",
     "${fwk_common_path}/utils/include",
@@ -50,7 +50,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
     "${services_path}/screentransport/screensourceprocessor/encoder/include",
     "${services_path}/softbusadapter/include",
     "${services_path}/screenservice/sourceservice/dscreenmgr/include",
-    "//foundation/graphic/graphic/rosen/modules/render_service_base/include",
+    "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
     "${interfaces_path}/innerkits/native_cpp/screen_sink/include",
     "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback",
   ]
@@ -70,7 +70,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
     "${services_path}/screenservice/sourceservice:distributed_screen_source",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn
index 13822b95d03ac02cf0ee60945fe35acdb50c15e7..afefd636318847f3e22c9f63a5eeb3a1b1cd2b88 100644
--- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn
+++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn
@@ -21,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -53,7 +53,7 @@ ohos_unittest("DataChannelTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
index b5bb758fc02a197109f4b9222d921f4c64a77d02..1bc52832fba12dcf06f0531b8943dd678c2a474c 100644
--- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
@@ -23,7 +23,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -58,7 +58,7 @@ ohos_unittest("SinkProcessorTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
index 39fdb36baf88c0753ce04adb31dfddd6608b7881..3f4533ae33845d01181c597a01b3ee9d6c493fdd 100644
--- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
@@ -23,7 +23,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -54,7 +54,7 @@ ohos_unittest("SinkTransTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
index ce81a19b09355c7f68704fa25166095472b88db9..15c0bae96eca5be0b9fbad533e1c5b08212c59a4 100644
--- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
@@ -21,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -57,7 +57,7 @@ ohos_unittest("SourceProcessorTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
index e681ecd3a15f3153330325a620e6b507e5442ea3..d81290ed8f3fe1f69b13c38c1ec8472e7d9e6a64 100644
--- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
@@ -21,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/log/include",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
@@ -57,7 +57,7 @@ ohos_unittest("SourceTransTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
index f90f883abc5d608b569c36f74518d2d7bf52da9f..b8f1cc8173e7acdf4ac419159db2ca03b5eeec9b 100644
--- a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -57,7 +57,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn
index 5cf515303d369a71c78ce5df3b1604d8c37d530d..2ef72f3e47e832d2f66b861f91a918b044fe6238 100644
--- a/services/softbusadapter/test/unittest/BUILD.gn
+++ b/services/softbusadapter/test/unittest/BUILD.gn
@@ -21,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/graphic/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -52,7 +52,7 @@ ohos_unittest("SoftBusAdapterTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",