!8304 refactor: 移动hidumper_adapter到legacy目录

Merge pull request !8304 from Zhangchunxin/refactor_dfx_dumper

adapter/common/net/bluetooth/net_bluetooth.gni

@@ -21,7 +21,7 @@ adapter_ble_inc = [
   "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/interface",
   "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/include",
   "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/ble/include",
-  "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+  "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
 ]
 adapter_ble_src = [
   "$dsoftbus_root_path/adapter/common/net/bluetooth/ble/softbus_adapter_ble_gatt_client.c",
@@ -30,8 +30,8 @@ adapter_ble_src = [
   "$dsoftbus_root_path/adapter/common/net/bluetooth/common/softbus_adapter_bt_common.c",
   "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/ble/src/softbus_ble_utils.c",
   "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/manager/src/softbus_broadcast_mgr.c",
-  "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/softbus_hidumper_bc_mgr.c",
-  "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/softbus_hidumper.c",
+  "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_bc_mgr.c",
+  "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/softbus_hidumper.c",
 ]
 
 if (dsoftbus_feature_ex_kits) {

core/common/BUILD.gn

@@ -56,7 +56,7 @@ if (defined(ohos_lite)) {
     include_dirs = [
       "$dsoftbus_root_path/core/common/include",
       "$dsoftbus_root_path/interfaces/kits/common",
-      "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+      "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
       "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
       "$dsoftbus_root_path/core/common/dfx/interface/include",
       "$softbus_adapter_common/include",
@@ -128,7 +128,7 @@ if (defined(ohos_lite)) {
   config("dsoftbus_utils_interface_L2") {
     include_dirs = [
       "$dsoftbus_root_path/core/common/include",
-      "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+      "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
       "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
       "$dsoftbus_root_path/core/common/dfx/interface/include",
       "$dsoftbus_root_path/interfaces/kits/common",
@@ -159,14 +159,14 @@ if (defined(ohos_lite)) {
     ]
     include_dirs += conn_common_inc + trans_common_inc
     dfx_source = [
-      "dfx/hidumper_adapter/softbus_hidumper.c",
-      "dfx/hidumper_adapter/softbus_hidumper_bc_mgr.c",
-      "dfx/hidumper_adapter/softbus_hidumper_broadcast.c",
-      "dfx/hidumper_adapter/softbus_hidumper_disc.c",
-      "dfx/hidumper_adapter/softbus_hidumper_conn.c",
-      "dfx/hidumper_adapter/softbus_hidumper_nstack.c",
-      "dfx/hidumper_adapter/softbus_hidumper_trans.c",
-      "dfx/hidumper_adapter/softbus_hidumper_buscenter.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_bc_mgr.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_broadcast.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_disc.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_conn.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_nstack.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_trans.c",
+      "dfx/dumper/legacy/hidumper_adapter/softbus_hidumper_buscenter.c",
       "dfx/hisysevent_adapter/softbus_hisysevt_nstack.c",
     ]
     sources = common_utils_src + conn_common_src + trans_common_src + dfx_source

core/common/dfx/dumper/legacy/hidumper_adapter/BUILD.gn

@@ -11,10 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("../../../transmission/common/trans_common.gni")
-import("../dsoftbus_dfx.gni")
+import("../../../../../transmission/common/trans_common.gni")
+import("../../../dsoftbus_dfx.gni")
 
-dsoftbus_root_path = "../../../.."
+dsoftbus_root_path = "../../../../../.."
 softbus_adapter_common = "${dsoftbus_root_path}/adapter/common"
 
 if (defined(ohos_lite)) {
@@ -27,7 +27,7 @@ if (defined(ohos_lite)) {
   }
   config("dsoftbus_dump_interface_lite") {
     include_dirs = [
-      "$dsoftbus_dfx_path/hidumper_adapter/include",
+      "$dsoftbus_dfx_path/dumper/legacy/hidumper_adapter/include",
       "$dsoftbus_root_path/interfaces/kits/common",
       "$dsoftbus_root_path/core/common/include",
       "$softbus_adapter_common/include",
@@ -65,7 +65,7 @@ if (defined(ohos_lite)) {
   cflags = [ "-DFILLP_LINUX" ]
   config("dsoftbus_dump_interface_std") {
     include_dirs = [
-      "$dsoftbus_dfx_path/hidumper_adapter/include",
+      "$dsoftbus_dfx_path/dumper/legacy/hidumper_adapter/include",
       "$dsoftbus_root_path/core/common/include",
       "$dsoftbus_root_path/components/nstackx/nstackx_core/dfile/interface",
       "$softbus_adapter_common/include",

core/frame/BUILD.gn

@@ -87,7 +87,7 @@ if (defined(ohos_lite)) {
       deps += [
         "$dsoftbus_root_path/adapter:softbus_adapter",
         "$dsoftbus_root_path/core/common:softbus_utils",
-        "$dsoftbus_root_path/core/common/dfx/hidumper_adapter:softbus_dfx_dump",
+        "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter:softbus_dfx_dump",
         "$dsoftbus_root_path/core/connection/wifi_direct_cpp:wifi_direct",
         "//build/lite/config/component/cJSON:cjson_static",
       ]
@@ -160,7 +160,7 @@ if (defined(ohos_lite)) {
         ":permission_json",
         "$dsoftbus_root_path/adapter:softbus_adapter",
         "$dsoftbus_root_path/core/common:softbus_utils",
-        "$dsoftbus_root_path/core/common/dfx/hidumper_adapter:softbus_dfx_dump",
+        "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter:softbus_dfx_dump",
         "$dsoftbus_root_path/core/connection/wifi_direct_cpp:wifi_direct",
         "//build/lite/config/component/cJSON:cjson_shared",
         "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single",
@@ -247,7 +247,7 @@ if (defined(ohos_lite)) {
       "$dsoftbus_root_path/interfaces/kits/transport",
       "$dsoftbus_feature_product_config_path/spec_config",
       "$dsoftbus_root_path/core/common/include",
-      "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+      "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
       "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
       "$dsoftbus_root_path/core/common/dfx/interface/include",
     ]
@@ -268,7 +268,7 @@ if (defined(ohos_lite)) {
       ":softbus_server.rc",
       "$dsoftbus_root_path/adapter:softbus_adapter",
       "$dsoftbus_root_path/core/common:softbus_utils",
-      "$dsoftbus_root_path/core/common/dfx/hidumper_adapter:softbus_dfx_dump",
+      "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter:softbus_dfx_dump",
       "$dsoftbus_root_path/core/connection/wifi_direct_cpp:wifi_direct",
     ]
     external_deps = [ "cJSON:cjson" ]

tests/adapter/fuzztest/softbusbroadcast_fuzzer/BUILD.gn

@@ -37,7 +37,7 @@ ohos_fuzztest("SoftBusBroadcastFuzzTest") {
     "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/interface",
     "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/include",
     "$dsoftbus_root_path/adapter/common/net/bluetooth/broadcast/adapter/ble/include",
-    "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+    "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
   ]
 
   deps = [

tests/core/common/dfx/hidumper_adapter/fuzztest/softbushidumper_fuzzer/BUILD.gn

@@ -27,7 +27,7 @@ ohos_fuzztest("SoftBusHiDumperFuzzTest") {
 
   include_dirs = [
     "$dsoftbus_root_path/core/common/include",
-    "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+    "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
     "$dsoftbus_root_path/tests/common/include",
   ]
 
@@ -43,7 +43,7 @@ ohos_fuzztest("SoftBusHiDumperFuzzTest") {
 
   deps = [
     "$dsoftbus_root_path/core/common:softbus_utils",
-    "$dsoftbus_root_path/core/common/dfx/hidumper_adapter:softbus_dfx_dump",
+    "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter:softbus_dfx_dump",
     "$dsoftbus_root_path/core/frame:softbus_server",
   ]
 

tests/core/common/dfx/hidumper_adapter/unittest/BUILD.gn

@@ -28,12 +28,12 @@ ohos_unittest("HidumperTest") {
     "$dsoftbus_root_path/core/transmission/common/include",
     "dsoftbus_root_path/interfaces/kits/common",
     "$dsoftbus_root_path/core/common/include",
-    "$dsoftbus_root_path/core/common/dfx/hidumper_adapter/include",
+    "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter/include",
   ]
 
   deps = [
     "$dsoftbus_root_path/core/common:softbus_utils",
-    "$dsoftbus_root_path/core/common/dfx/hidumper_adapter:softbus_dfx_dump",
+    "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter:softbus_dfx_dump",
     "$dsoftbus_root_path/core/frame:softbus_server",
   ]
   external_deps = [

tests/core/common/dfx/hisysevent_adapter/unittest/BUILD.gn

@@ -76,7 +76,7 @@ if (defined(ohos_lite)) {
     include_dirs = [
       "$dsoftbus_root_path/core/common/include",
       "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include",
-      "$dsoftbus_root_path/core/common/dfx/hidumper_adapter",
+      "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter",
     ]
     deps = [
       "$dsoftbus_root_path/core/common:softbus_utils",

tests/core/common/dfx/statistics/unittest/BUILD.gn

@@ -34,7 +34,7 @@ ohos_unittest("TransNetworkStatisticsTest") {
 
   deps = [
     "$dsoftbus_root_path/core/common:softbus_utils",
-    "$dsoftbus_root_path/core/common/dfx/hidumper_adapter:softbus_dfx_dump",
+    "$dsoftbus_root_path/core/common/dfx/dumper/legacy/hidumper_adapter:softbus_dfx_dump",
     "$dsoftbus_root_path/core/frame:softbus_server",
   ]
   external_deps = [

tests/core/discovery/coap/unittest/BUILD.gn

@@ -32,7 +32,7 @@ ohos_unittest("DiscNstackxAdapterTest") {
     "../../../../../core/bus_center/lnn/lane_hub/lane_manager/include",
     "../../../../../core/bus_center/lnn/net_ledger/common/include",
     "../../../../../core/bus_center/lnn/net_ledger/local_ledger/include",
-    "../../../../../core/common/dfx/hidumper_adapter/include",
+    "../../../../../core/common/dfx/dumper/legacy/hidumper_adapter/include",
     "../../../../../core/common/include",
     "../../../../../core/discovery/ble/dispatcher/include",
     "../../../../../core/discovery/coap/interface",
@@ -71,7 +71,7 @@ ohos_unittest("DiscCoapTest") {
     "../../../../../core/bus_center/lnn/lane_hub/lane_manager/include",
     "../../../../../core/bus_center/lnn/net_ledger/common/include",
     "../../../../../core/bus_center/lnn/net_ledger/local_ledger/include",
-    "../../../../../core/common/dfx/hidumper_adapter/include",
+    "../../../../../core/common/dfx/dumper/legacy/hidumper_adapter/include",
     "../../../../../core/common/include",
     "../../../../../core/discovery/ble/dispatcher/include",
     "../../../../../core/discovery/coap/interface",

tests/core/discovery/manager/unittest/BUILD.gn

@@ -63,7 +63,7 @@ ohos_unittest("DiscManagerMockTest") {
     "$softbus_adapter_common/include",
     "$dsoftbus_core_path/common/include",
     "$dsoftbus_core_path/common/dfx/hisysevent_adapter/include",
-    "$dsoftbus_core_path/common/dfx/hidumper_adapter/include",
+    "$dsoftbus_core_path/common/dfx/dumper/legacy/hidumper_adapter/include",
     "$dsoftbus_core_path/discovery/interface",
     "$dsoftbus_core_path/discovery/ipc/include",
     "$dsoftbus_core_path/discovery/manager/include",