move appspawn_standard to appspawn

Signed-off-by: laiguizhong <laiguizhong@huawei.com>
Change-Id: I4d7543447d8bb3619b5bab1b0b34364d75283527
This commit is contained in:
laiguizhong 2022-06-08 20:09:15 +08:00
parent 7cbf371625
commit 48f3a260a2
15 changed files with 42 additions and 41 deletions

View File

@ -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") {

View File

@ -11,7 +11,7 @@ Appspawn is responsible for creating application process and setting process inf
## Directory Structure<a name="section161941989596"></a>
```
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)**

View File

@ -13,7 +13,7 @@
## 目录
```
base/startup/appspawn_standard
base/startup/appspawn
├── include # 应用孵化器组件头文件
├── parameter # 应用孵化器组件系统参数
├── src # 应用孵化器组件源文件

View File

@ -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"

View File

@ -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"
]
}
}

View File

@ -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"
}

View File

@ -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") {

View File

@ -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" ]
}
}

View File

@ -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"
]
}
}

View File

@ -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") {

View File

@ -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") {

View File

@ -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",
]

View File

@ -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") {

View File

@ -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") {

View File

@ -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") {