From c4eed9dba420dd0a06a10955a151e092c7cf4cba Mon Sep 17 00:00:00 2001
From: zmx <1029211721@qq.com>
Date: Wed, 29 Sep 2021 16:50:50 +0800
Subject: [PATCH] samgr part name rectify

Signed-off-by: zmx <1029211721@qq.com>
Change-Id: I200bbcba59ee84fe47a8d25d01db78ef7742ea40
Signed-off-by: zmx <1029211721@qq.com>
---
 OAT.xml  => OAT.xml                           |  2 +-
 interfaces/innerkits/lsamgr/BUILD.gn          |  2 +-
 interfaces/innerkits/samgr_proxy/BUILD.gn     |  2 +-
 ohos.build                                    | 27 +++++++++++++++++++
 services/samgr/native/BUILD.gn                | 10 +++----
 .../{samgr_L2.cfg => samgr_standard.cfg}      |  0
 .../native/{samgr_L2.rc => samgr_standard.rc} |  0
 7 files changed, 35 insertions(+), 8 deletions(-)
 rename OAT.xml  => OAT.xml (96%)
 mode change 100644 => 100755
 rename services/samgr/native/{samgr_L2.cfg => samgr_standard.cfg} (100%)
 rename services/samgr/native/{samgr_L2.rc => samgr_standard.rc} (100%)

diff --git a/OAT.xml  b/OAT.xml
old mode 100644
new mode 100755
similarity index 96%
rename from OAT.xml 
rename to OAT.xml
index 9b3e485a..2f102fb2
--- a/OAT.xml 	
+++ b/OAT.xml
@@ -56,7 +56,7 @@ Note:If the text contains special characters, please escape them according to th
         <licensefile></licensefile>
         <filefilterlist>
             <filefilter name="copyrightPolicyFilter" desc="copyright文件头校验策略的过滤条件" >
-                <filteritem type="filepath" name="services/samgr/native/samgr_L2.cfg" desc="cfg文件为json格式,无法添加版权头"/>
+                <filteritem type="filepath" name="services/samgr/native/samgr_standard.cfg" desc="cfg文件为json格式,无法添加版权头"/>
             </filefilter>
         </filefilterlist>
     </oatconfig>
diff --git a/interfaces/innerkits/lsamgr/BUILD.gn b/interfaces/innerkits/lsamgr/BUILD.gn
index 06dae698..932b647b 100755
--- a/interfaces/innerkits/lsamgr/BUILD.gn
+++ b/interfaces/innerkits/lsamgr/BUILD.gn
@@ -33,7 +33,7 @@ ohos_shared_library("lsamgr") {
       "hiviewdfx_hilog_native:libhilog",
       "ipc:ipc_core",
     ]
-    part_name = "samgr_L2"
+    part_name = "samgr_standard"
   }
 
   deps = [ "//utils/native/base:utils" ]
diff --git a/interfaces/innerkits/samgr_proxy/BUILD.gn b/interfaces/innerkits/samgr_proxy/BUILD.gn
index cefe2c2e..2c92a7ec 100755
--- a/interfaces/innerkits/samgr_proxy/BUILD.gn
+++ b/interfaces/innerkits/samgr_proxy/BUILD.gn
@@ -54,7 +54,7 @@ ohos_shared_library("samgr_proxy") {
     ]
 
     deps = [ "//utils/native/base:utils" ]
-    part_name = "samgr_L2"
+    part_name = "samgr_standard"
   }
   subsystem_name = "distributedschedule"
 }
diff --git a/ohos.build b/ohos.build
index 62c277ea..b69fdd50 100755
--- a/ohos.build
+++ b/ohos.build
@@ -26,6 +26,33 @@
             ],
             "test_list": ["//foundation/distributedschedule/samgr/services/samgr/native/test:unittest"],
             "system_kits": []
+        },
+        "samgr_standard": {
+            "variants": ["phone", "wearable"],
+            "inner_kits": [
+                {
+                    "header": {
+                        "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/",
+                        "header_files": [
+                            "iservice_registry.h",
+                            "if_system_ability_manager.h",
+                            "system_ability_manager_proxy.h",
+                            "sam_log.h",
+                            "system_ability_info.h",
+                            "if_system_ability_connection_callback.h"
+                        ]
+                    },
+                    "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy"
+                }
+            ],
+            "module_list": [
+                "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+                "//foundation/distributedschedule/samgr/services/samgr/native:samgr",
+                "//foundation/distributedschedule/samgr/services/samgr/native:etc",
+                "//third_party/libxml2:libxml2"
+            ],
+            "test_list": ["//foundation/distributedschedule/samgr/services/samgr/native/test:unittest"],
+            "system_kits": []
         }
     },
     "subsystem": "distributedschedule"
diff --git a/services/samgr/native/BUILD.gn b/services/samgr/native/BUILD.gn
index 9b7e4a4e..e3c8d1bb 100755
--- a/services/samgr/native/BUILD.gn
+++ b/services/samgr/native/BUILD.gn
@@ -43,11 +43,11 @@ group("etc") {
 ohos_prebuilt_etc("samgr.rc") {
   relative_install_dir = "init"
   if (use_musl) {
-    source = "samgr_L2.cfg"
+    source = "samgr_standard.cfg"
   } else {
-    source = "samgr_L2.rc"
+    source = "samgr_standard.rc"
   }
-  part_name = "samgr_L2"
+  part_name = "samgr_standard"
   subsystem_name = "distributedschedule"
 }
 
@@ -67,7 +67,7 @@ ohos_executable("samgr") {
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
-  
+
   configs = [
     ":sam_config",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:config_samgr",
@@ -81,7 +81,7 @@ ohos_executable("samgr") {
       "ipc:libdbinder",
     ]
     public_deps = [ "//third_party/libxml2:libxml2" ]
-    part_name = "samgr_L2"
+    part_name = "samgr_standard"
   }
   subsystem_name = "distributedschedule"
 }
diff --git a/services/samgr/native/samgr_L2.cfg b/services/samgr/native/samgr_standard.cfg
similarity index 100%
rename from services/samgr/native/samgr_L2.cfg
rename to services/samgr/native/samgr_standard.cfg
diff --git a/services/samgr/native/samgr_L2.rc b/services/samgr/native/samgr_standard.rc
similarity index 100%
rename from services/samgr/native/samgr_L2.rc
rename to services/samgr/native/samgr_standard.rc
-- 
Gitee