From f95ce6c49c3244269e2f8ed8405df2023e024cd7 Mon Sep 17 00:00:00 2001
From: jiangkuaixue <jiangchenzhou@huawei.com>
Date: Thu, 5 May 2022 19:02:01 +0800
Subject: [PATCH] fix chmod nwebspawn error path

Signed-off-by: jiangkuaixue <jiangchenzhou@huawei.com>
---
 BUILD.gn                                    | 39 ++++++++++++++++++++-
 interfaces/innerkits/include/appspawn_msg.h |  2 +-
 standard/appspawn_service.c                 |  2 +-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index bd8ac1a1..19580595 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -114,6 +114,43 @@ ohos_prebuilt_etc("appspawn.rc") {
   part_name = "${part_name}"
 }
 
+ohos_static_library("nwebspawn_server") {
+  sources = [
+    "${appspawn_path}/adapter/appspawn_adapter.cpp",
+    "${appspawn_path}/adapter/appspawn_log.cpp",
+    "${appspawn_path}/adapter/appspawn_sandbox.cpp",
+    "${appspawn_path}/common/appspawn_server.c",
+    "${appspawn_path}/standard/appspawn_process.c",
+    "${appspawn_path}/standard/appspawn_service.c",
+    "${appspawn_path}/util/src/json_utils.cpp",
+    "${appspawn_path}/util/src/sandbox_utils.cpp",
+  ]
+  defines = [
+    "GRAPHIC_PERMISSION_CHECK",
+    "INIT_AGENT",
+    "NWEB_SPAWN",
+  ]
+  configs = [ ":appspawn_config" ]
+  ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker64z" ]
+  deps = [
+    "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
+    "//base/startup/init_lite/interfaces/innerkits:libbegetutil",
+    "//base/startup/init_lite/interfaces/innerkits/sandbox:libsandbox",
+    "//base/startup/init_lite/services/loopevent:loopevent",
+    "//base/startup/init_lite/services/utils:libinit_tools",
+    "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara",
+    "//third_party/libuv:uv_static",
+    "//utils/native/base:utils",
+  ]
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  if (build_selinux) {
+    external_deps += [ "selinux:libhap_restorecon" ]
+  }
+
+  subsystem_name = "${subsystem_name}"
+  part_name = "${part_name}"
+}
+
 ohos_executable("nwebspawn") {
   defines = [ "NWEB_SPAWN" ]
   sources = [
@@ -124,7 +161,7 @@ ohos_executable("nwebspawn") {
   ]
   configs = [ ":appspawn_config" ]
   deps = [
-    "${appspawn_path}:appspawn_server",
+    "${appspawn_path}:nwebspawn_server",
     "//base/startup/init_lite/interfaces/innerkits/sandbox:libsandbox",
   ]
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
diff --git a/interfaces/innerkits/include/appspawn_msg.h b/interfaces/innerkits/include/appspawn_msg.h
index c7fb99a2..d34a78a2 100644
--- a/interfaces/innerkits/include/appspawn_msg.h
+++ b/interfaces/innerkits/include/appspawn_msg.h
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-#ifdef __MUSL__
+#if defined(__MUSL__) || defined(NWEB_SPAWN)
 #define  SOCKET_DIR "/dev/unix/socket/"
 #else
 #define  SOCKET_DIR "/dev/socket/"
diff --git a/standard/appspawn_service.c b/standard/appspawn_service.c
index ebfc10c4..e4ba28bf 100644
--- a/standard/appspawn_service.c
+++ b/standard/appspawn_service.c
@@ -227,7 +227,7 @@ static int GetProcessTerminationStatus(AppSpawnClientExt *appProperty)
     if (appProperty == NULL) {
         return -1;
     }
-    if (appProperty->property.code == AppOperateType::GET_RENDER_TERMINATION_STATUS) {
+    if (appProperty->property.code == GET_RENDER_TERMINATION_STATUS) {
         int exitStatus = 0;
         int ret = GetRenderProcessTerminationStatus(appProperty->property.pid, &exitStatus);
         if (ret) {
-- 
Gitee