From 85e36f6e1a70927522d5f1728fe2b405e1a8a5cf Mon Sep 17 00:00:00 2001
From: m30052598 <muhe1@huawei.com>
Date: Mon, 22 Apr 2024 21:14:48 +0800
Subject: [PATCH] device_usage_statistic elastic deployment rectification

---
 BUILD.gn                    | 33 +++++++++++++++++++++++++++++++++
 bundle.json                 | 16 ++++------------
 device_usage_statistics.gni |  1 +
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 323eb33..bf44f71 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -342,3 +342,36 @@ ohos_shared_library("usagestatsutils") {
     debug = false
   }
 }
+
+group("bfwk_group_all") {
+  if (device_usage_statistics_device_enable) {
+    deps = [
+      "${usage_statistics_path}:bundlestate",
+      "${usage_statistics_path}:usagestatsinner",
+      "${usage_statistics_path}:usagestatsutils"
+    ]
+  }
+}
+
+group("service_group_all") {
+  if (device_usage_statistics_device_enable) {
+    deps = [
+      "${usage_statistics_path}:device_usage_statistics_sa_profile",
+      "${usage_statistics_path}:device_usage_statistics_service_init",
+      "${usage_statistics_path}:usagestatistics",
+      "${usage_statistics_path}:usagestatservice"
+    ]
+  }
+}
+
+group("test_all") {
+  testonly = true
+  if (device_usage_statistics_device_enable) {
+    deps = [
+      "${usage_statistics_path}/test/fuzztest/appgroupcallbackstub_fuzzer:fuzztest",
+      "${usage_statistics_path}/test/fuzztest/bundleactiveobserver_fuzzer:fuzztest",
+      "${usage_statistics_path}/test/fuzztest/bundleactiveonremoterequest_fuzzer:fuzztest",
+      "${usage_statistics_path}/test/unittest:unittest"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/bundle.json b/bundle.json
index 524fc90..db67d10 100644
--- a/bundle.json
+++ b/bundle.json
@@ -15,7 +15,7 @@
     "syscap": [ "SystemCapability.ResourceSchedule.UsageStatistics.AppGroup",
                 "SystemCapability.ResourceSchedule.UsageStatistics.App"
               ],
-    "features": [],
+    "features": [ "device_usage_statistics_device_enable" ],
     "adapted_system_type": [
       "standard"
     ],
@@ -49,15 +49,10 @@
       "group_type" : {
         "base_group": [],
         "fwk_group": [
-          "//foundation/resourceschedule/device_usage_statistics:usagestatsinner",
-          "//foundation/resourceschedule/device_usage_statistics:usagestatsutils",
-          "//foundation/resourceschedule/device_usage_statistics:bundlestate"
+          "//foundation/resourceschedule/device_usage_statistics:bfwk_group_all"
         ],
         "service_group": [
-          "//foundation/resourceschedule/device_usage_statistics:usagestatservice",
-          "//foundation/resourceschedule/device_usage_statistics:device_usage_statistics_sa_profile",
-          "//foundation/resourceschedule/device_usage_statistics:device_usage_statistics_service_init",
-          "//foundation/resourceschedule/device_usage_statistics:usagestatistics"
+          "//foundation/resourceschedule/device_usage_statistics:service_group_all"
         ]
       },
       "inner_kits": [
@@ -83,11 +78,8 @@
         }
       ],
       "test": [
-        "//foundation/resourceschedule/device_usage_statistics/test/unittest:unittest",
         "//foundation/resourceschedule/device_usage_statistics/interfaces/test/unittest/device_usage_statistics_jsunittest:js_unittest",
-        "//foundation/resourceschedule/device_usage_statistics/test/fuzztest/bundleactiveonremoterequest_fuzzer:fuzztest",
-        "//foundation/resourceschedule/device_usage_statistics/test/fuzztest/bundleactiveobserver_fuzzer:fuzztest",
-        "//foundation/resourceschedule/device_usage_statistics/test/fuzztest/appgroupcallbackstub_fuzzer:fuzztest"
+        "//foundation/resourceschedule/device_usage_statistics:test_all"
       ]
     }
   }
diff --git a/device_usage_statistics.gni b/device_usage_statistics.gni
index ca36e03..986c708 100644
--- a/device_usage_statistics.gni
+++ b/device_usage_statistics.gni
@@ -31,6 +31,7 @@ if (defined(global_parts_info) &&
 
 declare_args() {
   bgtaskmgr_enable = true
+  device_usage_statistics_device_enable = true
   if (defined(global_parts_info) &&
       !defined(global_parts_info.resourceschedule_background_task_mgr)) {
     bgtaskmgr_enable = false
-- 
Gitee