!1763 device status 弹性部署

Merge pull request !1763 from yang123/master

BUILD.gn

@@ -16,11 +16,11 @@ import("device_status.gni")
 group("devicestatus_service_group") {
   deps = []
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [ "${device_status_root_path}/intention/cooperate/plugin:intention_cooperate" ]
   }
 
-  if (fusion_rust_enabled) {
+  if (device_status_rust_enabled) {
     deps += [
       "${device_status_root_path}/rust/ipc/server:fusion_ipc_server_ffi",
       "${device_status_root_path}/rust/modules/coordination/server:fusion_coordination_server_ffi",
@@ -47,7 +47,7 @@ group("device_status_tests") {
     "test/unittest:device_status_unittest",
   ]
 
-  if (fusion_rust_enabled) {
+  if (device_status_rust_enabled) {
     deps += [ "${device_status_root_path}/rust/modules/scheduler/test:fusion_scheduler_test" ]
   }
 }

device_status.gni

@@ -14,13 +14,13 @@
 import("//build/ohos.gni")
 
 declare_args() {
-  fusion_intention_framework = true
-  fusion_rust_enabled = false
-  fusion_interaction_coordination = false
-  fusion_drag_enable_monitor = true
-  fusion_drag_enable_interceptor = false
-  fusion_drag_enable_animation = false
-  fusion_performance_check = true
+  device_status_intention_framework = true
+  device_status_rust_enabled = false
+  device_status_interaction_coordination = false
+  device_status_drag_enable_monitor = true
+  device_status_drag_enable_interceptor = false
+  device_status_drag_enable_animation = false
+  device_status_performance_check = true
   device_status_sensor_enable = true
   device_status_memmgr_enable = false
   if (defined(global_parts_info)) {
@@ -50,30 +50,30 @@ file_dfs_service_path = "//foundation/filemanagement/dfs_service"
 
 device_status_default_defines = []
 
-if (fusion_intention_framework) {
+if (device_status_intention_framework) {
   device_status_default_defines += [ "OHOS_BUILD_ENABLE_INTENTION_FRAMEWORK" ]
 }
 
-if (fusion_rust_enabled) {
+if (device_status_rust_enabled) {
   device_status_default_defines += [ "OHOS_BUILD_ENABLE_RUST_IMPL" ]
 }
 
-if (fusion_interaction_coordination) {
+if (device_status_interaction_coordination) {
   device_status_default_defines += [ "OHOS_BUILD_ENABLE_COORDINATION" ]
 }
 
-if (fusion_performance_check) {
+if (device_status_performance_check) {
   device_status_default_defines += [ "ENABLE_PERFORMANCE_CHECK" ]
 }
 
-if (fusion_drag_enable_monitor) {
+if (device_status_drag_enable_monitor) {
   device_status_default_defines += [ "OHOS_DRAG_ENABLE_MONITOR" ]
 }
 
-if (fusion_drag_enable_interceptor) {
+if (device_status_drag_enable_interceptor) {
   device_status_default_defines += [ "OHOS_DRAG_ENABLE_INTERCEPTOR" ]
 }
 
-if (fusion_drag_enable_animation) {
+if (device_status_drag_enable_animation) {
   device_status_default_defines += [ "OHOS_DRAG_ENABLE_ANIMATION" ]
 }

frameworks/js/napi/interaction/BUILD.gn

@@ -30,7 +30,7 @@ group("interaction_jsapi_group") {
   deps = [
     "${device_status_frameworks_path}/js/napi/interaction/drag:draginteraction",
   ]
-  if (fusion_interaction_coordination) {
+  if (device_status_interaction_coordination) {
     deps += [ "${device_status_frameworks_path}/js/napi/interaction/cooperate:inputdevicecooperate" ]
     deps += [ "${device_status_frameworks_path}/js/napi/interaction/coordination:cooperate" ]
   }

interfaces/innerkits/BUILD.gn

@@ -29,7 +29,7 @@ config("devicestatus_public_config") {
     "${device_status_root_path}/services/communication/client/include",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     include_dirs +=
         [ "${device_status_root_path}/intention/frameworks/client/include" ]
   }
@@ -63,11 +63,11 @@ ohos_shared_library("devicestatus_client") {
     "${device_status_root_path}/services/communication/client/src/devicestatus_srv_proxy.cpp",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     sources += [ "${device_status_root_path}/intention/frameworks/client/src/intention_manager.cpp" ]
   } else {
     sources += [ "${device_status_frameworks_path}/native/interaction/src/interaction_manager_impl.cpp" ]
-    if (fusion_interaction_coordination) {
+    if (device_status_interaction_coordination) {
       sources += [ "${device_status_frameworks_path}/native/interaction/src/coordination_manager_impl.cpp" ]
     }
   }
@@ -81,7 +81,7 @@ ohos_shared_library("devicestatus_client") {
 
   public_configs = [ ":devicestatus_public_config" ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [
       "${device_status_root_path}/intention/cooperate/client:intention_cooperate_client",
       "${device_status_root_path}/intention/drag/client:intention_drag_client",
@@ -92,7 +92,7 @@ ohos_shared_library("devicestatus_client") {
     ]
   }
 
-  if (fusion_rust_enabled) {
+  if (device_status_rust_enabled) {
     include_dirs =
         [ "${device_status_root_path}/rust/frameworks/binding/include" ]
 

sa_profile/BUILD.gn

@@ -15,7 +15,7 @@ import("//build/ohos/sa_profile/sa_profile.gni")
 import("../device_status.gni")
 
 ohos_sa_profile("devicestatus_sa_profile") {
-  if (fusion_rust_enabled) {
+  if (device_status_rust_enabled) {
     sources = [ "2902_rust.json" ]
   } else {
     sources = [ "2902.json" ]

services/BUILD.gn

@@ -26,7 +26,7 @@ config("devicestatus_services_private_config") {
     "communication/service/include",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     include_dirs += [
       "${device_status_root_path}/intention/cooperate/server/include",
       "${device_status_root_path}/intention/drag/server/include",
@@ -44,7 +44,7 @@ config("devicestatus_services_public_config") {
     "interaction/drag/include",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     include_dirs += [
       "${device_status_root_path}/intention/cooperate/server/include",
       "${device_status_root_path}/intention/drag/server/include",
@@ -110,7 +110,7 @@ ohos_shared_library("devicestatus_service") {
     "interaction/drag:interaction_drag",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [
       "${device_status_root_path}/intention/adapters/dsoftbus_adapter:intention_dsoftbus_adapter",
       "${device_status_root_path}/intention/adapters/input_adapter:intention_input_adapter",
@@ -125,7 +125,7 @@ ohos_shared_library("devicestatus_service") {
     "${device_status_root_path}/intention/services/device_manager:intention_device_manager",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     public_deps += [
       "${device_status_root_path}/intention/ipc/socket:intention_socket_session_manager",
       "${device_status_root_path}/intention/ipc/tunnel:intention_tunnel_server",
@@ -138,10 +138,10 @@ ohos_shared_library("devicestatus_service") {
     defines += [ "DEVICE_STATUS_SENSOR_ENABLE" ]
   }
   external_deps = external_deps_set
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     external_deps += [ "device_manager:devicemanagersdk" ]
   } else {
-    if (fusion_interaction_coordination) {
+    if (device_status_interaction_coordination) {
       external_deps += [ "device_manager:devicemanagersdk" ]
     }
   }
@@ -179,7 +179,7 @@ ohos_static_library("devicestatus_static_service") {
     "interaction/drag:interaction_drag",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [
       "${device_status_root_path}/intention/adapters/dsoftbus_adapter:intention_dsoftbus_adapter",
       "${device_status_root_path}/intention/adapters/input_adapter:intention_input_adapter",
@@ -199,7 +199,7 @@ ohos_static_library("devicestatus_static_service") {
     "${device_status_root_path}/intention/services/device_manager:intention_device_manager",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     public_deps += [
       "${device_status_root_path}/intention/ipc/socket:intention_socket_session_manager",
       "${device_status_root_path}/intention/ipc/tunnel:intention_tunnel_server",
@@ -208,10 +208,10 @@ ohos_static_library("devicestatus_static_service") {
   }
 
   external_deps = external_deps_set
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     external_deps += [ "device_manager:devicemanagersdk" ]
   } else {
-    if (fusion_interaction_coordination) {
+    if (device_status_interaction_coordination) {
       external_deps += [ "device_manager:devicemanagersdk" ]
     }
   }

test/fuzztest/BUILD.gn

@@ -52,7 +52,7 @@ group("device_status_fuzztest") {
     "updatepreviewstylewithanimationstub_fuzzer:fuzztest",
     "updateshadowpic_fuzzer:fuzztest",
   ]
-  if (fusion_interaction_coordination) {
+  if (device_status_interaction_coordination) {
     deps += [
       "activatecooperate_fuzzer:fuzztest",
       "activatecoordination_fuzzer:fuzztest",

test/fuzztest/devicegetcachestub_fuzzer/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import("../../../device_status.gni")
-if (fusion_interaction_coordination) {
+if (device_status_interaction_coordination) {
   import("//base/msdp/motion/motion.gni")
 }
 

test/fuzztest/devicesubscribestub_fuzzer/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import("../../../device_status.gni")
-if (fusion_interaction_coordination) {
+if (device_status_interaction_coordination) {
   import("//base/msdp/motion/motion.gni")
 }
 

test/fuzztest/deviceunsubscribestub_fuzzer/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import("../../../device_status.gni")
-if (fusion_interaction_coordination) {
+if (device_status_interaction_coordination) {
   import("//base/msdp/motion/motion.gni")
 }
 

test/unittest/intention/scheduler/BUILD.gn

@@ -89,7 +89,7 @@ ohos_unittest("TimerManagerTest") {
 group("unittest") {
   testonly = true
   deps = []
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [ ":TimerManagerTest" ]
   }
 }

test/unittest/intention/services/BUILD.gn

@@ -69,7 +69,7 @@ ohos_unittest("IntentionServiceTest") {
     "//third_party/googletest:gtest_main",
   ]
 
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [
       "${device_status_root_path}/intention/adapters/dsoftbus_adapter:intention_dsoftbus_adapter",
       "${device_status_root_path}/intention/adapters/input_adapter:intention_input_adapter",
@@ -98,7 +98,7 @@ ohos_unittest("IntentionServiceTest") {
 group("unittest") {
   testonly = true
   deps = []
-  if (fusion_intention_framework) {
+  if (device_status_intention_framework) {
     deps += [ ":IntentionServiceTest" ]
   }
 }