!747 move init_module_engine to innerkits directory

Merge pull request !747 from handy/0531

bundle.json

@@ -47,8 +47,7 @@
                 "//base/startup/init_lite/interfaces/innerkits/file:libfile",
                 "//base/startup/init_lite/interfaces/innerkits/socket:libsocket",
                 "//base/startup/init_lite/services/loopevent:loopevent",
-                "//base/startup/init_lite/services/init/module_engine:libinit_module_engine",
-                "//base/startup/init_lite/services/init/module_engine:libinit_stub_empty",
+                "//base/startup/init_lite/interfaces/innerkits/init_module_engine:init_module_engine",
                 "//base/startup/init_lite/device_info:device_info_group",
                 "//base/startup/init_lite/interfaces/innerkits/sandbox:libsandbox",
                 "//base/startup/init_lite/test/exec_test:exectest",
@@ -88,12 +87,12 @@
                 },
                 {
                     "header": {
-                        "header_base": "//base/startup/init_lite/services/init/module_engine/include",
+                        "header_base": "//base/startup/init_lite/interfaces/innerkits",
                         "header_files": [
-                            "init_module_engine.h"
+                            "init_module_engine/include/init_module_engine.h"
                         ]
                     },
-                    "name": "//base/startup/init_lite/services/init/module_engine:libinit_module_engine"
+                    "name": "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_module_engine"
                 }
             ],
             "test": [

interfaces/innerkits/init_module_engine/BUILD.gn

@@ -14,24 +14,39 @@
 import("//build/ohos.gni")
 import("//build/ohos/native_stub/native_stub.gni")
 
-config("libinit_module_engine_config") {
+#
+# exported include directories
+#
+config("init_module_engine_exported_config") {
+  visibility = [ ":*" ]
   include_dirs = [
-    "//base/startup/init_lite/services/init/module_engine/include",
+    "include/",
     "//base/startup/init_lite/services/include",
     "//base/startup/init_lite/interfaces/innerkits/include",
+    "//base/startup/init_lite/services/log",
   ]
 }
 
+#
+# innerkits for module developement
+#
 ohos_native_stub_library("libinit_module_engine") {
   output_extension = "so"
-  public_configs = [ ":libinit_module_engine_config" ]
+  public_configs = [ ":init_module_engine_exported_config" ]
   stub_description_file = "./stub/libinit.stub.json"
 }
 
+#
+# For init linking,
+# export symbols defined in this json files only
+#
 ohos_native_stub_versionscript("libinit_stub_versionscript") {
   stub_description_file = "./stub/libinit.stub.json"
 }
 
+#
+# Generate empty library with symlink name to satisfy init loading required libraries
+#
 ohos_native_stub_library("libinit_stub_empty") {
   output_extension = "so"
   stub_description_file = "./stub/libinit.stub.empty.json"
@@ -39,3 +54,27 @@ ohos_native_stub_library("libinit_stub_empty") {
   install_enable = true
   symlink_target_name = [ "libinit_module_engine.so" ]
 }
+
+config("init_module_engine_sources_config") {
+  include_dirs = [
+    "//base/startup/init_lite/interfaces/innerkits/init_module_engine/include",
+    "//base/startup/init_lite/interfaces/innerkits/include",
+    "//base/startup/init_lite/services/include",
+    "//base/startup/init_lite/services/log",
+  ]
+}
+
+ohos_source_set("init_module_engine_sources") {
+  sources = [ "init_modulemgr.c" ]
+  public_configs = [ ":init_module_engine_sources_config" ]
+}
+
+#
+# init module engine all modules
+#
+group("init_module_engine") {
+  deps = [
+    ":libinit_module_engine",
+    ":libinit_stub_empty",
+  ]
+}

services/BUILD.gn

@@ -136,7 +136,6 @@ if (defined(ohos_lite)) {
     modulemgr_sources = [
       "//base/startup/init_lite/interfaces/innerkits/hookmgr/hookmgr.c",
       "//base/startup/init_lite/interfaces/innerkits/modulemgr/modulemgr.c",
-      "init/module_engine/init_modulemgr.c",
     ]
     sources += modulemgr_sources
 
@@ -150,7 +149,7 @@ if (defined(ohos_lite)) {
       "//base/startup/init_lite/services/include/param",
       "//base/startup/init_lite/services/include",
       "//base/startup/init_lite/services/init/include",
-      "//base/startup/init_lite/services/init/module_engine/include",
+      "//base/startup/init_lite/interfaces/innerkits/init_module_engine/include",
       "//base/startup/init_lite/services/log",
       "//base/startup/init_lite/interfaces/innerkits/include",
       "//base/startup/init_lite/services/loopevent/include",
@@ -178,7 +177,8 @@ if (defined(ohos_lite)) {
       "//third_party/cJSON:cjson_static",
     ]
 
-    deps += [ "//base/startup/init_lite/services/init/module_engine:libinit_stub_versionscript" ]
+    deps += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript" ]
+    deps += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:init_module_engine_sources" ]
 
     deps += [ "//base/startup/init_lite/services/modules:static_modules" ]
 
@@ -227,9 +227,9 @@ if (defined(ohos_lite)) {
       defines += [ "PRODUCT_RK" ]
     }
     version_script = get_label_info(
-                         "//base/startup/init_lite/services/init/module_engine:libinit_stub_versionscript",
+                         "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript",
                          "target_gen_dir") + "/" + get_label_info(
-                         "//base/startup/init_lite/services/init/module_engine:libinit_stub_versionscript",
+                         "//base/startup/init_lite/interfaces/innerkits/init_module_engine:libinit_stub_versionscript",
                          "name") + stub_version_script_suffix
     defines += [ "_GNU_SOURCE" ]
     install_images = [

services/init/include/init_cmdexecutor.h

@@ -1 +1 @@
-../module_engine/include/init_cmdexecutor.h
+../../../interfaces/innerkits/init_module_engine/include/init_cmdexecutor.h

services/modules/BUILD.gn

@@ -18,12 +18,8 @@ ohos_shared_library("bootchart") {
   sources = [ "bootchart/bootchart.c" ]
 
   include_dirs = [
-    "//base/startup/init_lite/services/include",
+    ".",
     "//base/startup/init_lite/services/include/param",
-    "//base/startup/init_lite/services/log",
-    "//base/startup/init_lite/services/modules",
-    "//base/startup/init_lite/interfaces/innerkits/include",
-    "//third_party/bounds_checking_function/include",
   ]
 
   deps = [
@@ -44,18 +40,13 @@ ohos_shared_library("bootchart") {
 }
 
 config("libbootchart_static_config") {
-  include_dirs = [
-    "//base/startup/init_lite/services/log",
-    "//base/startup/init_lite/services/modules",
-    "//base/startup/init_lite/services/init/module_engine/include",
-    "//base/startup/init_lite/services/include",
-    "//base/startup/init_lite/interfaces/innerkits/include",
-  ]
+  include_dirs = [ "." ]
 }
 
 ohos_source_set("libbootchart_static") {
   sources = [ "bootchart/bootchart_static.c" ]
   public_configs = [ ":libbootchart_static_config" ]
+  public_configs += [ "//base/startup/init_lite/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]
 }
 
 group("modules") {