From 18cc9c1bce6ca7462c3ace19bd3df587f1cfffb5 Mon Sep 17 00:00:00 2001
From: chen <chenkang40@huawei.com>
Date: Sat, 8 Jan 2022 18:12:25 +0800
Subject: [PATCH 1/2] add lsmagr as innerkit

Signed-off-by: chen <chenkang40@huawei.com>
Change-Id: I77e3d16ca395d9a0ab4cd89286476f92d4246c35
---
 interfaces/innerkits/lsamgr/BUILD.gn         |  7 +++++++
 ohos.build                                   | 10 ++++++++++
 services/samgr/native/test/unittest/BUILD.gn |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 ohos.build

diff --git a/interfaces/innerkits/lsamgr/BUILD.gn b/interfaces/innerkits/lsamgr/BUILD.gn
index 9fc817ec..1aaaf715 100755
--- a/interfaces/innerkits/lsamgr/BUILD.gn
+++ b/interfaces/innerkits/lsamgr/BUILD.gn
@@ -21,11 +21,18 @@ config("config_samgr") {
   ]
 }
 
+config("public_config_lsamgr") {
+  include_dirs =
+      [ "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr" ]
+}
+
 ################################################################################
 ohos_shared_library("lsamgr") {
   sources = [ "../../../services/lsamgr/src/local_ability_manager_proxy.cpp" ]
 
   configs = [ ":config_samgr" ]
+  public_configs = [ ":public_config_lsamgr" ]
+
   if (is_standard_system) {
     external_deps = [
       "hiviewdfx_hilog_native:libhilog",
diff --git a/ohos.build b/ohos.build
old mode 100644
new mode 100755
index afeea530..26cc0d95
--- a/ohos.build
+++ b/ohos.build
@@ -28,6 +28,16 @@
                         ]
                     },
                     "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common"
+                },
+                {
+                    "header": {
+                        "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr/",
+                        "header_files": [
+                            "if_local_ability_manager.h",
+                            "local_ability_manager_proxy.h"
+                        ]
+                    },
+                    "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:lsamgr"
                 }
             ],
             "module_list": [
diff --git a/services/samgr/native/test/unittest/BUILD.gn b/services/samgr/native/test/unittest/BUILD.gn
index 4333dc9c..a930ae3f 100755
--- a/services/samgr/native/test/unittest/BUILD.gn
+++ b/services/samgr/native/test/unittest/BUILD.gn
@@ -22,7 +22,7 @@ config("sam_test_config") {
   include_dirs = [
     "${samgr_services_dir}/test/unittest/include",
     "//utils/system/safwk/native/include",
-    ]
+  ]
 }
 
 ohos_unittest("SystemAbilityMgrTest") {
-- 
Gitee


From b81e82a8f479cb4c4849251fbcad3fcbad1fe10e Mon Sep 17 00:00:00 2001
From: chen <chenkang40@huawei.com>
Date: Sat, 8 Jan 2022 19:32:42 +0800
Subject: [PATCH 2/2] add samgr part

Signed-off-by: chen <chenkang40@huawei.com>
Change-Id: I76bdd9f56aea8f12e727153a254bd8ae221838f6
---
 ohos.build | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/ohos.build b/ohos.build
index 26cc0d95..779cea72 100755
--- a/ohos.build
+++ b/ohos.build
@@ -52,6 +52,59 @@
                 "//foundation/distributedschedule/samgr/services/common/test:unittest"
             ],
             "system_kits": []
+        },
+        "samgr": {
+            "variants": ["phone", "wearable"],
+            "inner_kits": [
+                {
+                    "header": {
+                        "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/",
+                        "header_files": [
+                            "if_system_ability_manager.h",
+                            "iservice_registry.h",
+                            "isystem_ability_load_callback.h",
+                            "isystem_ability_status_change.h",
+                            "system_ability_manager_proxy.h",
+                            "system_ability_load_callback_stub.h",
+                            "system_ability_status_change_stub.h",
+                            "sam_log.h"
+                        ]
+                    },
+                    "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy"
+                },
+                {
+                    "header": {
+                        "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/common/include/",
+                        "header_files": [
+                            "sa_profiles.h",
+                            "parse_util.h"
+                        ]
+                    },
+                    "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common"
+                },
+                {
+                    "header": {
+                        "header_base": "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr/",
+                        "header_files": [
+                            "if_local_ability_manager.h",
+                            "local_ability_manager_proxy.h"
+                        ]
+                    },
+                    "name": "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:lsamgr"
+                }
+            ],
+            "module_list": [
+                "//foundation/distributedschedule/samgr/interfaces/innerkits/common:samgr_common",
+                "//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",
+                "//foundation/distributedschedule/samgr/services/common/test:unittest"
+            ],
+            "system_kits": []
         }
     },
     "subsystem": "distributedschedule"
-- 
Gitee