delete dmsbase innersdk

Signed-off-by: majiajun <majiajun@huawei.com>

Change-Id: I232dfd671d254074aa5792d4716a6e448a744ba0

bundle.json

@@ -54,28 +54,11 @@
           "//foundation/distributedschedule/dmsfwk/etc/profile:distributedsched_trust",
           "//foundation/distributedschedule/dmsfwk/interfaces/kits/napi:napi_packages",
           "//foundation/distributedschedule/dmsfwk/sa_profile:dms_sa_profile",
+          "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner",
           "//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr:distributed_ability_manager_svr",
           "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr"
         ],
         "inner_kits": [
-          {
-            "header": {
-              "header_base": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/dmsbase/include",
-              "header_files": [
-                "adapter/dnetwork_adapter.h",
-                "deviceManager/dms_device_info.h",
-                "dfx/dms_hisysevent_report.h",
-                "dfx/dms_hitrace_chain.h",
-                "dfx/dms_hitrace_constants.h",
-                "distributed_device_node_listener.h",
-                "dms_notifier.h",
-                "dtbschedmgr_device_info_storage.h",
-                "dtbschedmgr_log.h",
-                "parcel_helper.h"
-              ]
-            },
-            "name": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/dmsbase:dmsbaseinner"
-          },
           {
             "header": {
               "header_base": "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/continuation_manager/include",

interfaces/innerkits/BUILD.gn

@@ -17,6 +17,5 @@ group("innerkits_target") {
   deps = [
     "common:common_sdk",
     "continuation_manager:continuation_manager",
-    "dmsbase:dmsbaseinner",
   ]
 }

interfaces/innerkits/common/BUILD.gn

@@ -17,7 +17,7 @@ config("common_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include/",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/dmsbase/include/",
+    "//foundation/distributedschedule/dmsfwk/services/base/include",
     "//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/include/",
     "//foundation/distributedschedule/dmsfwk/utils/native/include/",
   ]

interfaces/innerkits/continuation_manager/BUILD.gn

@@ -17,7 +17,7 @@ config("continuation_manager_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include/",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/dmsbase/include/",
+    "//foundation/distributedschedule/dmsfwk/services/base/include",
   ]
 
   cflags = []

interfaces/kits/napi/continuation_manager/BUILD.gn

@@ -17,7 +17,7 @@ config("continuationmanager_napi_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include/",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/dmsbase/include/",
+    "//foundation/distributedschedule/dmsfwk/services/base/include",
   ]
 
   cflags = []

services/base/BUILD.gn

@@ -25,15 +25,12 @@ config("distributed_sched_config") {
 ohos_shared_library("dmsbaseinner") {
   install_enable = true
   sources = [
-    "../../../services/base/src/adapter/dnetwork_adapter.cpp",
-    "../../../services/base/src/deviceManager/dms_device_info.cpp",
-    "../../../services/base/src/dfx/dms_hisysevent_report.cpp",
-    "../../../services/base/src/dfx/dms_hitrace_chain.cpp",
-    "../../../services/base/src/distributed_device_node_listener.cpp",
-    "../../../services/base/src/dtbschedmgr_device_info_storage.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/continuationManager/continuation_extra_params.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/continuationManager/continuation_result.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbabilitymgr/src/continuationManager/device_selection_notifier_stub.cpp",
+    "src/adapter/dnetwork_adapter.cpp",
+    "src/deviceManager/dms_device_info.cpp",
+    "src/dfx/dms_hisysevent_report.cpp",
+    "src/dfx/dms_hitrace_chain.cpp",
+    "src/distributed_device_node_listener.cpp",
+    "src/dtbschedmgr_device_info_storage.cpp",
   ]
 
   configs = [ ":distributed_sched_config" ]

services/dtbabilitymgr/BUILD.gn

@@ -23,6 +23,7 @@ config("distributed_ability_manager_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include/",
+    "../base/include/",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/common/include/",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/continuation_manager/include/",
   ]
@@ -48,7 +49,6 @@ ohos_shared_library("distributed_ability_manager_svr") {
   ldflags = [ "-rdynamic" ]
 
   external_deps = [
-    "dmsfwk_standard:dmsbaseinner",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
@@ -59,6 +59,9 @@ ohos_shared_library("distributed_ability_manager_svr") {
     "utils_base:utils",
   ]
 
+  deps =
+      [ "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner" ]
+
   part_name = "dmsfwk_standard"
   subsystem_name = "distributedschedule"
 }

services/dtbabilitymgr/test/BUILD.gn

@@ -26,12 +26,13 @@ dtbabilitymgr_configs = [
 
 config("test_config") {
   visibility = [ ":*" ]
-  include_dirs =
-      [ "//foundation/distributedschedule/dmsfwk/utils/native/include" ]
+  include_dirs = [
+    "//foundation/distributedschedule/dmsfwk/utils/native/include",
+    "//foundation/distributedschedule/dmsfwk/services/base/include",
+  ]
 }
 
 dtbabilitymgr_external_deps = [
-  "dmsfwk_standard:dmsbaseinner",
   "dsoftbus:softbus_client",
   "eventhandler:libeventhandler",
   "hiviewdfx_hilog_native:libhilog",
@@ -43,6 +44,7 @@ dtbabilitymgr_external_deps = [
 ]
 
 dtbabilitymgr_public_deps = [
+  "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner",
   "//third_party/googletest:gmock_main",
   "//third_party/googletest:gtest_main",
   "//third_party/libxml2:libxml2",

services/dtbschedmgr/BUILD.gn

@@ -22,7 +22,10 @@ group("unittest") {
 
 config("distributed_sched_config") {
   visibility = [ ":*" ]
-  include_dirs = [ "include" ]
+  include_dirs = [
+    "include",
+    "../base/include/",
+  ]
   if (dmsfwk_standard_mission_manager) {
     defines = [ "SUPPORT_DISTRIBUTED_MISSION_MANAGER" ]
   }
@@ -63,7 +66,6 @@ ohos_shared_library("distributedschedsvr") {
     "device_auth:deviceauth_sdk",
     "distributeddatamgr:distributeddata_inner",
     "dmsfwk_standard:continuation_manager",
-    "dmsfwk_standard:dmsbaseinner",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hitrace_native:hitrace_meter",
@@ -77,6 +79,9 @@ ohos_shared_library("distributedschedsvr") {
     "utils_base:utils",
   ]
 
+  deps =
+      [ "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner" ]
+
   if (dmsfwk_standard_mission_manager) {
     defines = [ "SUPPORT_DISTRIBUTED_MISSION_MANAGER" ]
     sources += [

services/dtbschedmgr/test/BUILD.gn

@@ -25,8 +25,10 @@ dsched_configs =
 
 config("test_config") {
   visibility = [ ":*" ]
-  include_dirs =
-      [ "//foundation/distributedschedule/dmsfwk/utils/native/include" ]
+  include_dirs = [
+    "//foundation/distributedschedule/dmsfwk/utils/native/include",
+    "//foundation/distributedschedule/dmsfwk/services/base/include",
+  ]
 }
 
 dsched_external_deps = [
@@ -38,7 +40,6 @@ dsched_external_deps = [
   "device_auth:deviceauth_sdk",
   "distributeddatamgr:distributeddata_inner",
   "dmsfwk_standard:continuation_manager",
-  "dmsfwk_standard:dmsbaseinner",
   "dsoftbus:softbus_client",
   "eventhandler:libeventhandler",
   "hitrace_native:hitrace_meter",
@@ -57,6 +58,7 @@ if (dmsfwk_standard_mission_manager) {
 }
 
 dsched_public_deps = [
+  "//foundation/distributedschedule/dmsfwk/services/base:dmsbaseinner",
   "//third_party/googletest:gmock_main",
   "//third_party/googletest:gtest_main",
   "//third_party/libxml2:libxml2",