From a79f7966067bd6c61c7c8ace7bd9d377ee97b1c2 Mon Sep 17 00:00:00 2001
From: toutes <zhaoruiyuan2@huawei.com>
Date: Sat, 22 Jan 2022 19:43:10 +0000
Subject: [PATCH 1/2] Change display_manager_native to display_manager

Signed-off-by: toutes <zhaoruiyuan2@huawei.com>
Change-Id: I95adfb23054c56bb504701c4fb52c76dcab6787f
---
 ohos.build => bundle.json | 93 +++++++++++++++++++++++++++------------
 displaymgr.gni            |  2 +-
 2 files changed, 66 insertions(+), 29 deletions(-)
 rename ohos.build => bundle.json (36%)
 mode change 100644 => 100755

diff --git a/ohos.build b/bundle.json
old mode 100644
new mode 100755
similarity index 36%
rename from ohos.build
rename to bundle.json
index 9a4169c..b6d401c
--- a/ohos.build
+++ b/bundle.json
@@ -1,28 +1,65 @@
-{
-  "subsystem": "powermgr",
-  "parts": {
-    "display_manager_native": {
-      "module_list": [
-        "//base/powermgr/display_manager/interfaces/innerkits:displaymgr",
-        "//base/powermgr/display_manager/sa_profile:displaymgr_sa_profile",
-        "//base/powermgr/display_manager/service:displaymgrservice",
-        "//base/powermgr/display_manager/interfaces/kits/js/napi:brightness"
-      ],
-      "inner_kits": [
-        {
-          "name": "//base/powermgr/display_manager/interfaces/innerkits:displaymgr",
-          "header": {
-            "header_files": [
-                "display_power_info.h",
-                "display_power_mgr_client.h"
-            ],
-            "header_base": "//base/powermgr/display_manager/interfaces/innerkits/native/include"
-          }
-        }
-      ],
-      "test_list": [
-        "//base/powermgr/display_manager/test/native:displaymgr_native_test"
-      ]
-    }
-  }
-}
+{
+  "name": "@ohos/powermgr_display_manager",
+  "version": "3.1",
+  "description": "显示能效管理，包括屏幕亮灭、亮度调节等。",
+  "homePage": "https://gitee.com/openharmony",
+  "license": " Apache License 2.0",
+  "repository": "https://gitee.com/openharmony/powermgr_display_manager",
+  "domain": "os",
+  "publishAs": "code-segment",
+  "scripts": {},
+  "dirs": [],
+  "segment": {
+    "destPath": "base/powermgr/display_manager"
+  },
+  "component": {
+    "name": "display_manager",
+    "subsystem": "powermgr",
+    "syscap": [
+      "SystemCapability.PowerMgr.DisplayManager"
+    ],
+    "features": [],
+    "adapted_system_type": [ "standard" ],
+    "rom": "1024KB",
+    "ram": "2048KB",
+    "deps": {
+      "components": [
+        "appexecfwk_standard",
+        "hiviewdfx_hilog_native",
+        "ipc",
+        "multimedia_image_standard",
+        "safwk",
+        "samgr_standard",
+        "sensor",
+        "window_manager"
+      ],
+      "third_party": [
+        "googletest",
+        "node"
+      ]
+    },
+    "build": {
+      "sub_component": [
+        "//base/powermgr/display_manager/interfaces/innerkits:displaymgr",
+        "//base/powermgr/display_manager/sa_profile:displaymgr_sa_profile",
+        "//base/powermgr/display_manager/service:displaymgrservice",
+        "//base/powermgr/display_manager/interfaces/kits/js/napi:brightness"
+      ],
+      "inner_kits": [
+        {
+          "name": "//base/powermgr/display_manager/interfaces/innerkits:displaymgr",
+          "header": {
+            "header_files": [
+              "display_power_info.h",
+              "display_power_mgr_client.h"
+            ],
+            "header_base": "//base/powermgr/display_manager/interfaces/innerkits/native/include"
+          }
+        }
+      ],
+      "test": [
+        "//base/powermgr/display_manager/test/native:displaymgr_native_test"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/displaymgr.gni b/displaymgr.gni
index af29775..d40f698 100644
--- a/displaymgr.gni
+++ b/displaymgr.gni
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-displaymgr_native_part_name = "display_manager_native"
+displaymgr_native_part_name = "display_manager"
 
 displaymgr_root_path = "//base/powermgr/display_manager"
 
-- 
Gitee


From b1d04dc7d84e05788eb2f42621b4f4283e876ee5 Mon Sep 17 00:00:00 2001
From: toutes <zhaoruiyuan2@huawei.com>
Date: Mon, 24 Jan 2022 18:29:38 +0000
Subject: [PATCH 2/2] Change display_manager to display_power_manager

Signed-off-by: toutes <zhaoruiyuan2@huawei.com>
---
 bundle.json    | 2 +-
 displaymgr.gni | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundle.json b/bundle.json
index b6d401c..b6945f5 100755
--- a/bundle.json
+++ b/bundle.json
@@ -13,7 +13,7 @@
     "destPath": "base/powermgr/display_manager"
   },
   "component": {
-    "name": "display_manager",
+    "name": "display_power_manager",
     "subsystem": "powermgr",
     "syscap": [
       "SystemCapability.PowerMgr.DisplayManager"
diff --git a/displaymgr.gni b/displaymgr.gni
index d40f698..383c7c1 100644
--- a/displaymgr.gni
+++ b/displaymgr.gni
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-displaymgr_native_part_name = "display_manager"
+displaymgr_native_part_name = "display_power_manager"
 
 displaymgr_root_path = "//base/powermgr/display_manager"
 
-- 
Gitee