diff --git a/BUILD.gn b/BUILD.gn index 1a1a33e1dfa706a2cfe3d01be5ce756f0d2987f7..c59f4a439f22f65282c806741612f77e5e171f44 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -116,12 +116,12 @@ ohos_prebuilt_etc("appspawn.rc") { part_name = "${part_name}" } -ohos_executable("webviewspawn") { - defines = [ "WEBVIEW_SPAWN" ] +ohos_executable("nwebspawn") { + defines = [ "NWEB_SPAWN" ] sources = [ "${appspawn_path}/src/main.cpp" ] configs = [ ":appspawn_config" ] deps = [ - "${appspawn_path}:webviewspawn_server", + "${appspawn_path}:nwebspawn_server", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] @@ -131,10 +131,10 @@ ohos_executable("webviewspawn") { part_name = "${part_name}" } -ohos_static_library("webviewspawn_server") { +ohos_static_library("nwebspawn_server") { defines = [ "INIT_AGENT", - "WEBVIEW_SPAWN", + "NWEB_SPAWN", ] sources = [ "${appspawn_path}/src/appspawn_msg_peer.cpp", @@ -172,19 +172,19 @@ ohos_static_library("webviewspawn_server") { part_name = "${part_name}" } -ohos_prebuilt_etc("webviewspawn.rc") { - source = "webviewspawn.cfg" +ohos_prebuilt_etc("nwebspawn.rc") { + source = "nwebspawn.cfg" relative_install_dir = "init" subsystem_name = "${subsystem_name}" part_name = "${part_name}" } -group("webview") { +group("nweb") { deps = [] - if (appspawn_support_webview) { + if (appspawn_support_nweb) { deps += [ - ":webviewspawn", - ":webviewspawn.rc", + ":nwebspawn", + ":nwebspawn.rc", ] } } diff --git a/appspawn.gni b/appspawn.gni index 5fc789cff540a0654aee1845bf600fea7ed8d101..6f9789610c16bf20c66194abb0e6621fee322a25 100644 --- a/appspawn.gni +++ b/appspawn.gni @@ -21,5 +21,5 @@ part_name = "appspawn" module_output_path = "${part_name}/appspawn_l2" declare_args() { - appspawn_support_webview = true + appspawn_support_nweb = true } diff --git a/bundle.json b/bundle.json index b9972a5bc7a35398be309775e5977da37667f1f0..f7b6d59379c913eb76d9397f97c920e83a23b974 100644 --- a/bundle.json +++ b/bundle.json @@ -18,7 +18,7 @@ "standard" ], "features": [ - "appspawn_support_webview" + "appspawn_support_nweb" ], "rom": "", "ram": "", @@ -38,7 +38,7 @@ "//base/startup/appspawn_standard:appspawn.rc", "//base/startup/appspawn_standard:appspawn_server", "//base/startup/appspawn_standard:appspawntools", - "//base/startup/appspawn_standard:webview", + "//base/startup/appspawn_standard:nweb", "//base/startup/appspawn_standard/interfaces/innerkits:appspawn_socket_client" ], "inner_kits": [ diff --git a/webviewspawn.cfg b/nwebspawn.cfg similarity index 72% rename from webviewspawn.cfg rename to nwebspawn.cfg index dc23b829830a8cf22ce53c354a497b79ac288864..7e5dbc730c59bd57ba7733ad5323be01c78d0d30 100644 --- a/webviewspawn.cfg +++ b/nwebspawn.cfg @@ -1,9 +1,9 @@ { "services" : [{ - "name" : "webviewspawn", - "path" : ["/system/bin/webviewspawn"], + "name" : "nwebspawn", + "path" : ["/system/bin/nwebspawn"], "socket" : [{ - "name" : "WebViewSpawn", + "name" : "NWebSpawn", "family" : "AF_LOCAL", "type" : "SOCK_SEQPACKET", "protocol" : "default", @@ -16,4 +16,4 @@ "ondemand" : true } ] -} \ No newline at end of file +} diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index b4e29c378e315c726e226cd81989eb7d592e789b..d8a0cfb7c74231816cbff56cdc51cfa7d34dd207 100755 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -219,8 +219,8 @@ void AppSpawnServer::HandleSignal() void AppSpawnServer::LoadAceLib() { -#ifdef WEBVIEW_SPAWN - std::string enginelibdir("/data/app/el1/bundle/public/com.ohos.webviewhap" +#ifdef NWEB_SPAWN + std::string enginelibdir("/data/app/el1/bundle/public/com.ohos.nweb" "/entry/libs/armeabi/libweb_engine.so"); HiLog::Info(LABEL, "MainThread::LoadAbilityLibrary libweb_engine. Start calling dlopen enginelibdir."); void *handle = dlopen(enginelibdir.c_str(), RTLD_NOW | RTLD_GLOBAL); @@ -231,16 +231,16 @@ void AppSpawnServer::LoadAceLib() } HiLog::Info(LABEL, "MainThread::LoadAbilityLibrary libweb_engine. End calling dlopen."); - std::string execlibdir("/data/app/el1/bundle/public/com.ohos.webviewhap" - "/entry/libs/armeabi/libwebview_exec_proc.so"); - HiLog::Info(LABEL, "MainThread::LoadAbilityLibrary libwebview_exec_proc. Start calling dlopen execlibdir."); - webviewHandle = dlopen(execlibdir.c_str(), RTLD_NOW | RTLD_GLOBAL); - if (webviewHandle == nullptr) { + std::string execlibdir("/data/app/el1/bundle/public/com.ohos.nweb" + "/entry/libs/armeabi/libnweb_render.so"); + HiLog::Info(LABEL, "MainThread::LoadAbilityLibrary libnweb_render. Start calling dlopen execlibdir."); + nwebHandle = dlopen(execlibdir.c_str(), RTLD_NOW | RTLD_GLOBAL); + if (nwebHandle == nullptr) { HiLog::Error(LABEL, "Fail to dlopen %{public}s, [%{public}s]", execlibdir.c_str(), dlerror()); } else { HiLog::Info(LABEL, "Success to dlopen %{public}s", execlibdir.c_str()); } - HiLog::Info(LABEL, "MainThread::LoadAbilityLibrary libwebview_exec_proc. End calling dlopen."); + HiLog::Info(LABEL, "MainThread::LoadAbilityLibrary libnweb_render. End calling dlopen."); #else std::string acelibdir("/system/lib/libace.z.so"); void *AceAbilityLib = nullptr; @@ -928,14 +928,14 @@ bool AppSpawnServer::SetAppProcProperty(const ClientSocket::AppProperty *appProp // notify success to father process and start app process NotifyResToParentProc(fd, ret); -#ifdef WEBVIEW_SPAWN +#ifdef NWEB_SPAWN using FuncType = void (*)(const char *cmd); - FuncType funcWebViewExecuteProcess = reinterpret_cast(dlsym(webviewHandle, "WebViewExecuteProcess")); - if (funcWebViewExecuteProcess == nullptr) { - HiLog::Error(LABEL, "webviewspawn dlsym ERROR=%{public}s", dlerror()); + FuncType funcNWebRenderMain = reinterpret_cast(dlsym(nwebHandle, "NWebRenderMain")); + if (funcNWebRenderMain == nullptr) { + HiLog::Error(LABEL, "nwebspawn dlsym ERROR=%{public}s", dlerror()); return false; } - funcWebViewExecuteProcess(appProperty->renderCmd); + funcNWebRenderMain(appProperty->renderCmd); #else AppExecFwk::MainThread::Start(); #endif diff --git a/src/include/appspawn_server.h b/src/include/appspawn_server.h index 09eb0fad61935453a53add3b4eb37f71b2923506..ad422eb46181f1c1bac60d77c45324bc5ac78da4 100644 --- a/src/include/appspawn_server.h +++ b/src/include/appspawn_server.h @@ -207,8 +207,8 @@ private: bool isChildDie_ { false }; pid_t childPid_ {}; std::map appMap_; -#ifdef WEBVIEW_SPAWN - void *webviewHandle = nullptr; +#ifdef NWEB_SPAWN + void *nwebHandle = nullptr; #endif }; } // namespace AppSpawn diff --git a/src/main.cpp b/src/main.cpp index 41e40b2a5ddb0f64347af8541c8fdd171895ef2f..95ae423a273e80495a4aa762ada464ff92f53e2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,8 +26,8 @@ int main(int argc, char *const argv[]) uintptr_t end = reinterpret_cast(strchr(argv[argc - 1], 0)); uintptr_t argvSize = end - start; -#ifdef WEBVIEW_SPAWN - OHOS::AppSpawn::AppSpawnServer appspawnServer("/dev/unix/socket/WebViewSpawn"); +#ifdef NWEB_SPAWN + OHOS::AppSpawn::AppSpawnServer appspawnServer("/dev/unix/socket/NWebSpawn"); #else OHOS::AppSpawn::AppSpawnServer appspawnServer("AppSpawn"); #endif diff --git a/src/socket/server_socket.cpp b/src/socket/server_socket.cpp index c7def0294a8c7fdc5e9139bc76fcbf95871d02da..7a0b14440a81d7cf1aa309f696abb45b3b9a7057 100644 --- a/src/socket/server_socket.cpp +++ b/src/socket/server_socket.cpp @@ -153,8 +153,8 @@ int ServerSocket::RegisterServerSocket(int &connectFd) return -EINVAL; } -#ifdef WEBVIEW_SPAWN - connectFd = GetControlSocket("WebViewSpawn"); +#ifdef NWEB_SPAWN + connectFd = GetControlSocket("NWebSpawn"); #else connectFd = CreateSocket(); #endif @@ -162,7 +162,7 @@ int ServerSocket::RegisterServerSocket(int &connectFd) return connectFd; } -#ifndef WEBVIEW_SPAWN +#ifndef NWEB_SPAWN if ((BindSocket(connectFd) != 0) || (listen(connectFd, listenBacklog_) < 0)) { HiLog::Error(LABEL, "Server: Register socket fd %d with backlog %d error: %d",