diff --git a/BUILD.gn b/BUILD.gn index cc99744b2c4924beac430c40915ea5b33c373fd8..d55c4d2d3bf4556d6d2c14550eb5d0cfaad6573c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/ohos.gni") config("appspawn_config") { diff --git a/README.md b/README.md index 15274e53ef7ee94c6ea150a096625fa306d150db..ffedc604ceaf79ab1a3b50b147e2c0d627d53d9b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Appspawn is responsible for creating application process and setting process inf ## Directory Structure ``` -base/startup/appspawn_standard +base/startup/appspawn ├── include # include directory ├── parameter # system parameters ├── src # source code @@ -23,4 +23,4 @@ base/startup/appspawn_standard Startup subsystem -**[appspawn_standard](https://gitee.com/openharmony/startup_appspawn/blob/master/README.md)** +**[appspawn](https://gitee.com/openharmony/startup_appspawn/blob/master/README.md)** diff --git a/README_zh.md b/README_zh.md index 474ff2e633ade5889233bb8c8fa24efedac43055..ea056af4efbfdee36c677c601914630280ba0899 100644 --- a/README_zh.md +++ b/README_zh.md @@ -13,7 +13,7 @@ ## 目录 ``` -base/startup/appspawn_standard +base/startup/appspawn ├── include # 应用孵化器组件头文件 ├── parameter # 应用孵化器组件系统参数 ├── src # 应用孵化器组件源文件 diff --git a/appspawn.gni b/appspawn.gni index c8d6837aef23e1e2f92397e093dadde00f928af9..e1366a812172e93698a966c1a2d14463454fd0a2 100644 --- a/appspawn.gni +++ b/appspawn.gni @@ -12,7 +12,7 @@ # limitations under the License. aafwk_kits_path = "//foundation/ability/ability_runtime/frameworks/kits" -appspawn_path = "//base/startup/appspawn_standard" +appspawn_path = "//base/startup/appspawn" aafwk_path = "//foundation/ability/ability_runtime" subsystem_name = "startup" part_name = "appspawn" diff --git a/bundle.json b/bundle.json index 8f5599c3fb5ee10634f898a16e78bd227ff98501..db9a6a01db841cad1e934d676dade64564399d9f 100644 --- a/bundle.json +++ b/bundle.json @@ -7,7 +7,7 @@ "repository": "https://gitee.com/openharmony/startup_appspawn", "publishAs": "code-segment", "segment": { - "destPath": "base/startup/appspawn_standard" + "destPath": "base/startup/appspawn" }, "dirs": {}, "scripts": {}, @@ -23,7 +23,7 @@ "rom": "", "ram": "", "hisysevent_config": [ - "//base/startup/appspawn_standard/startup_events.yaml" + "//base/startup/appspawn/startup_events.yaml" ], "deps": { "components": [ @@ -38,28 +38,28 @@ }, "build": { "sub_component": [ - "//base/startup/appspawn_standard:appspawn", - "//base/startup/appspawn_standard:appspawn.rc", - "//base/startup/appspawn_standard:appspawn_server", - "//base/startup/appspawn_standard:nweb", - "//base/startup/appspawn_standard/etc:etc_files", - "//base/startup/appspawn_standard/interfaces/innerkits:appspawn_socket_client" + "//base/startup/appspawn:appspawn", + "//base/startup/appspawn:appspawn.rc", + "//base/startup/appspawn:appspawn_server", + "//base/startup/appspawn:nweb", + "//base/startup/appspawn/etc:etc_files", + "//base/startup/appspawn/interfaces/innerkits:appspawn_socket_client" ], "inner_kits": [ { "header": { - "header_base": "//base/startup/appspawn_standard/interfaces/innerkits/include/", + "header_base": "//base/startup/appspawn/interfaces/innerkits/include/", "header_files": [ "appspawn_socket.h", "client_socket.h" ] }, - "name": "//base/startup/appspawn_standard/interfaces/innerkits:appspawn_socket_client" + "name": "//base/startup/appspawn/interfaces/innerkits:appspawn_socket_client" } ], "test": [ - "//base/startup/appspawn_standard/test:moduletest", - "//base/startup/appspawn_standard/test:unittest" + "//base/startup/appspawn/test:moduletest", + "//base/startup/appspawn/test:unittest" ] } } diff --git a/etc/BUILD.gn b/etc/BUILD.gn index 194eb139e8100f9c0853c7aa4566d166de6dd270..664fb21da1f4091074a350de20eaf8bc060165c9 100644 --- a/etc/BUILD.gn +++ b/etc/BUILD.gn @@ -9,16 +9,16 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/ohos.gni") ohos_prebuilt_etc("appdata-sandbox.json") { if (target_cpu == "arm64") { - source = "//base/startup/appspawn_standard/appdata-sandbox64.json" + source = "//base/startup/appspawn/appdata-sandbox64.json" } else { - source = "//base/startup/appspawn_standard/appdata-sandbox.json" + source = "//base/startup/appspawn/appdata-sandbox.json" } subsystem_name = "${subsystem_name}" @@ -27,7 +27,7 @@ ohos_prebuilt_etc("appdata-sandbox.json") { } ohos_prebuilt_etc("product-sandbox.json") { - source = "//base/startup/appspawn_standard/product-sandbox.json" + source = "//base/startup/appspawn/product-sandbox.json" part_name = "${part_name}" module_install_dir = "etc/sandbox" } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 8d6c1072a8dba3861aa83b01ac409977cc9a32ae..a8a9000668d5bd434fe203e80bb803813c9ea21e 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/ohos.gni") config("exported_header_files") { diff --git a/lite/BUILD.gn b/lite/BUILD.gn index 614aa1036143ba97c5dca202215882fd7d37a0f9..f3e69def01f496f1162061d23df26fb1f5b6600d 100644 --- a/lite/BUILD.gn +++ b/lite/BUILD.gn @@ -46,7 +46,7 @@ executable("appspawn") { include_dirs = [ ".", "../common", - "//base/startup/appspawn_standard/interfaces/innerkits/include", + "//base/startup/appspawn/interfaces/innerkits/include", "//base/startup/init_lite/interfaces/innerkits/include", "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", @@ -86,6 +86,7 @@ executable("appspawn") { if (ohos_build_type == "debug") { group("unittest") { - deps = [ "//base/startup/appspawn_standard/test/unittest/app_spawn_lite_test:unittest" ] + deps = + [ "//base/startup/appspawn/test/unittest/app_spawn_lite_test:unittest" ] } } diff --git a/lite/bundle.json b/lite/bundle.json index 41e26ed50f21e38b2b909d4f5b7689d64794a53f..a679b4ff3f437e1af4d5b816e971d0148bffab9c 100644 --- a/lite/bundle.json +++ b/lite/bundle.json @@ -4,10 +4,10 @@ "homePage": "https://gitee.com/openharmony", "version": "3.1", "license": "Apache License 2.0", - "repository": "https://gitee.com/openharmony/appspawn_standard", + "repository": "https://gitee.com/openharmony/appspawn", "publishAs": "code-segment", "segment": { - "destPath": "base/startup/appspawn_standard/lite" + "destPath": "base/startup/appspawn/lite" }, "dirs": {}, "scripts": {}, @@ -37,10 +37,10 @@ }, "build": { "sub_component": [ - "//base/startup/appspawn_standard/lite:appspawn_lite" + "//base/startup/appspawn/lite:appspawn_lite" ], "test": [ - "//base/startup/appspawn_standard/test/unittest/app_spawn_lite_test:unittest" + "//base/startup/appspawn/test/unittest/app_spawn_lite_test:unittest" ] } } diff --git a/test/BUILD.gn b/test/BUILD.gn index 83f2b49eb5a05e497edcc88edb36abc715583bda..2ec39d88d8c57ea09a1de2f0c0fd3bfdd1685eeb 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/test.gni") group("unittest") { diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index a445285fe32713ab667818ae8e674c8c83460ffc..7da7f725c8e5a15b71ff61cd5bef8e89b6c8f558 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/test.gni") ohos_moduletest("AppSpawnModuleTest") { diff --git a/test/unittest/app_spawn_lite_test/BUILD.gn b/test/unittest/app_spawn_lite_test/BUILD.gn index 90a9382517e2b83f12132600f8d96933793176e0..9f5734d737a010936eae9903e051b5bc0b419b4c 100644 --- a/test/unittest/app_spawn_lite_test/BUILD.gn +++ b/test/unittest/app_spawn_lite_test/BUILD.gn @@ -23,9 +23,9 @@ unittest("AppSpawnLiteTest") { ] include_dirs = [ - "//base/startup/appspawn_standard/interfaces/innerkits/include", - "//base/startup/appspawn_standard/common/", - "//base/startup/appspawn_standard/lite/", + "//base/startup/appspawn/interfaces/innerkits/include", + "//base/startup/appspawn/common/", + "//base/startup/appspawn/lite/", "//base/startup/init_lite/interfaces/innerkits/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits/hilog", "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", @@ -37,10 +37,10 @@ unittest("AppSpawnLiteTest") { ] sources = [ - "//base/startup/appspawn_standard/common/appspawn_server.c", - "//base/startup/appspawn_standard/lite/appspawn_message.c", - "//base/startup/appspawn_standard/lite/appspawn_process.c", - "//base/startup/appspawn_standard/lite/appspawn_service.c", + "//base/startup/appspawn/common/appspawn_server.c", + "//base/startup/appspawn/lite/appspawn_message.c", + "//base/startup/appspawn/lite/appspawn_process.c", + "//base/startup/appspawn/lite/appspawn_service.c", "app_spawn_lite_test.cpp", ] diff --git a/test/unittest/app_spawn_socket_test/BUILD.gn b/test/unittest/app_spawn_socket_test/BUILD.gn index c90d98727458b2cb17e8ec4e4edb674f1678abb4..fd9e3ccabf5a4bb0309e32c7a3ae28c65399daf1 100644 --- a/test/unittest/app_spawn_socket_test/BUILD.gn +++ b/test/unittest/app_spawn_socket_test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/test.gni") ohos_unittest("AppSpawnSocketTest") { diff --git a/test/unittest/app_spawn_standard_test/BUILD.gn b/test/unittest/app_spawn_standard_test/BUILD.gn index 7a0d1ba8e3aee8618676f035b7b70482d623ebce..7daf34b2a2a9812163e145cae3e6517162b3e169 100644 --- a/test/unittest/app_spawn_standard_test/BUILD.gn +++ b/test/unittest/app_spawn_standard_test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/test.gni") ohos_unittest("AppSpawnStandardTest") { diff --git a/test/unittest/client_socket_test/BUILD.gn b/test/unittest/client_socket_test/BUILD.gn index d5ba067ad7967469a1e627e41febef872ae1a971..24d258cc1575c8e2eb0bd4573d66ba963726b33f 100644 --- a/test/unittest/client_socket_test/BUILD.gn +++ b/test/unittest/client_socket_test/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/startup/appspawn_standard/appspawn.gni") +import("//base/startup/appspawn/appspawn.gni") import("//build/test.gni") ohos_unittest("ClientSocketTest") {