From cda4bdbfe5c57ee63a13796637e2d8f2d3f83df2 Mon Sep 17 00:00:00 2001 From: jiangzhijun8 Date: Tue, 27 Aug 2024 17:05:21 +0800 Subject: [PATCH 01/11] Issye: https://gitee.com/openharmony/ability_ability_runtime/issues/I9TGJJ Signed-off-by: jiangzhijun8 --- bundle.json | 5 +++- frameworks/js/napi/ability/BUILD.gn | 5 +++- .../js/napi/abilityDataUriUtils/BUILD.gn | 5 +++- .../ability_auto_startup_callback/BUILD.gn | 6 ++++ .../ability_auto_startup_manager/BUILD.gn | 4 +++ frameworks/js/napi/ability_context/BUILD.gn | 5 +++- .../js/napi/action_extension_ability/BUILD.gn | 5 +++- .../js/napi/app/ability_delegator/BUILD.gn | 1 + .../app/ability_lifecycle_callback/BUILD.gn | 5 +++- frameworks/js/napi/app/ability_stage/BUILD.gn | 5 +++- .../napi/app/ability_stage_context/BUILD.gn | 5 +++- .../js/napi/app/application_context/BUILD.gn | 5 +++- .../BUILD.gn | 5 +++- frameworks/js/napi/application/BUILD.gn | 1 + frameworks/js/napi/auto_fill_manager/BUILD.gn | 6 ++++ .../js/napi/dialog_request_info/BUILD.gn | 2 ++ frameworks/js/napi/inner/napi_common/BUILD.gn | 7 +++++ .../js/napi/js_child_process_manager/BUILD.gn | 7 +++++ frameworks/js/napi/js_dialog_session/BUILD.gn | 7 +++++ frameworks/native/ability/BUILD.gn | 7 +++++ frameworks/native/ability/native/BUILD.gn | 18 ++++++++++- .../ability/native/app_module_checker.cpp | 1 + frameworks/native/appkit/BUILD.gn | 11 ++++++- .../ability_runtime/context/context_impl.cpp | 12 ++++---- .../insight_intent_context/BUILD.gn | 6 ++++ interfaces/inner_api/ability_manager/BUILD.gn | 21 +++++++++++++ .../app_manager/src/appmgr/ams_mgr_proxy.cpp | 30 +++++++++---------- .../inner_api/auto_fill_manager/BUILD.gn | 1 + .../inner_api/child_process_manager/BUILD.gn | 1 + interfaces/inner_api/deps_wrapper/BUILD.gn | 2 ++ interfaces/inner_api/error_utils/BUILD.gn | 1 + interfaces/inner_api/runtime/BUILD.gn | 3 +- interfaces/inner_api/wantagent/BUILD.gn | 1 + .../frameworks/js_environment/BUILD.gn | 2 ++ .../services/srms/BUILD.gn | 3 ++ services/abilitymgr/BUILD.gn | 1 + services/abilitymgr/include/dlp_utils.h | 1 + services/appmgr/src/ams_mgr_scheduler.cpp | 4 +-- services/appmgr/src/app_mgr_service.cpp | 4 +-- services/appmgr/src/app_mgr_service_inner.cpp | 2 +- services/appmgr/src/app_running_manager.cpp | 2 +- services/appmgr/src/app_spawn_client.cpp | 16 +++++----- services/common/BUILD.gn | 4 +++ test/unittest/BUILD.gn | 3 ++ tools/aa/BUILD.gn | 6 ++++ tools/aa/src/ability_command.cpp | 10 +++---- utils/server/startup/BUILD.gn | 1 + 47 files changed, 212 insertions(+), 53 deletions(-) diff --git a/bundle.json b/bundle.json index 14d247fdf9..a4b8281e83 100644 --- a/bundle.json +++ b/bundle.json @@ -92,10 +92,13 @@ "sandbox_manager", "screenlock_mgr", "storage_service", + "skia", "toolchain", "webview", "window_manager", - "zlib" + "zlib", + "ets_frontend", + "runtime_core" ], "third_party": [ "libjpeg-turbo" diff --git a/frameworks/js/napi/ability/BUILD.gn b/frameworks/js/napi/ability/BUILD.gn index f0d62f746f..ada25d0bff 100644 --- a/frameworks/js/napi/ability/BUILD.gn +++ b/frameworks/js/napi/ability/BUILD.gn @@ -48,7 +48,10 @@ template("ohos_ability_napi") { ":ability_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/abilityDataUriUtils/BUILD.gn b/frameworks/js/napi/abilityDataUriUtils/BUILD.gn index b0a1bd7857..42ea94ceb0 100644 --- a/frameworks/js/napi/abilityDataUriUtils/BUILD.gn +++ b/frameworks/js/napi/abilityDataUriUtils/BUILD.gn @@ -42,7 +42,10 @@ ohos_shared_library("datauriutils") { ":ability_data_uri_utils_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn b/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn index 477aeb266d..9e4800366d 100644 --- a/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn +++ b/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn @@ -40,9 +40,15 @@ ohos_shared_library("autostartupcallback") { external_deps = [ "ability_base:session_info", "c_utils:utils", + "ets_runtime:libark_jsruntime", + "eventhandler:libeventhandler", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] if (ability_runtime_graphics) { diff --git a/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn b/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn index 8fd346403f..c0a83ce58c 100644 --- a/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn +++ b/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn @@ -45,10 +45,14 @@ ohos_shared_library("autostartupmanager") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "ets_runtime:libark_jsruntime", + "eventhandler:libeventhandler", + "graphic_2d:2d_graphics", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", + "skia:skia_canvaskit", ] relative_install_dir = "module/app/ability" diff --git a/frameworks/js/napi/ability_context/BUILD.gn b/frameworks/js/napi/ability_context/BUILD.gn index e3bf547c57..ed8661f9da 100644 --- a/frameworks/js/napi/ability_context/BUILD.gn +++ b/frameworks/js/napi/ability_context/BUILD.gn @@ -42,7 +42,10 @@ ohos_shared_library("abilitycontext_napi") { ":ability_context_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/action_extension_ability/BUILD.gn b/frameworks/js/napi/action_extension_ability/BUILD.gn index 0553ca9e05..e3b4fe2f52 100755 --- a/frameworks/js/napi/action_extension_ability/BUILD.gn +++ b/frameworks/js/napi/action_extension_ability/BUILD.gn @@ -42,7 +42,10 @@ ohos_shared_library("actionextensionability_napi") { ":action_extension_ability_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/ability_delegator/BUILD.gn b/frameworks/js/napi/app/ability_delegator/BUILD.gn index 1af4ab7730..fb503b5232 100644 --- a/frameworks/js/napi/app/ability_delegator/BUILD.gn +++ b/frameworks/js/napi/app/ability_delegator/BUILD.gn @@ -55,6 +55,7 @@ template("delegator") { "hilog:libhilog", "hitrace:hitrace_meter", "napi:ace_napi", + "resource_management:global_resmgr", ] cflags_cc = [] diff --git a/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn b/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn index b06d092825..d764dccfda 100644 --- a/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn +++ b/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn @@ -42,7 +42,10 @@ ohos_shared_library("abilitylifecyclecallback") { ":ability_lifecycle_callback_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/ability_stage/BUILD.gn b/frameworks/js/napi/app/ability_stage/BUILD.gn index 8379ecdda4..a7f7588f05 100644 --- a/frameworks/js/napi/app/ability_stage/BUILD.gn +++ b/frameworks/js/napi/app/ability_stage/BUILD.gn @@ -59,7 +59,10 @@ ohos_shared_library("abilitystage_napi") { ":ability_stage_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/ability_stage_context/BUILD.gn b/frameworks/js/napi/app/ability_stage_context/BUILD.gn index c0508957bb..e30e60b6ae 100644 --- a/frameworks/js/napi/app/ability_stage_context/BUILD.gn +++ b/frameworks/js/napi/app/ability_stage_context/BUILD.gn @@ -42,7 +42,10 @@ ohos_shared_library("abilitystagecontext_napi") { ":ability_stage_context_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/application_context/BUILD.gn b/frameworks/js/napi/app/application_context/BUILD.gn index 27c5067d6c..c20f6fb4a6 100644 --- a/frameworks/js/napi/app/application_context/BUILD.gn +++ b/frameworks/js/napi/app/application_context/BUILD.gn @@ -42,7 +42,10 @@ ohos_shared_library("applicationcontext_napi") { ":application_context_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/application_state_change_callback/BUILD.gn b/frameworks/js/napi/app/application_state_change_callback/BUILD.gn index 39fc58e92a..e4856839ca 100644 --- a/frameworks/js/napi/app/application_state_change_callback/BUILD.gn +++ b/frameworks/js/napi/app/application_state_change_callback/BUILD.gn @@ -44,7 +44,10 @@ ohos_shared_library("applicationstatechangecallback") { ":application_state_change_callback_js", ] - external_deps = [ "napi:ace_napi" ] + external_deps = [ + "napi:ace_napi", + "ets_runtime:libark_jsruntime", + ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/application/BUILD.gn b/frameworks/js/napi/application/BUILD.gn index 6e38f0181c..d5343c5d7f 100644 --- a/frameworks/js/napi/application/BUILD.gn +++ b/frameworks/js/napi/application/BUILD.gn @@ -54,6 +54,7 @@ ohos_shared_library("application_napi") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", + "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/frameworks/js/napi/auto_fill_manager/BUILD.gn b/frameworks/js/napi/auto_fill_manager/BUILD.gn index 3cf609afa7..b70e3e6419 100644 --- a/frameworks/js/napi/auto_fill_manager/BUILD.gn +++ b/frameworks/js/napi/auto_fill_manager/BUILD.gn @@ -37,7 +37,13 @@ ohos_shared_library("autofillmanager_napi") { external_deps = [ "ability_base:view_data", + "ability_base:want", + "c_utils:utils", + "ets_runtime:libark_jsruntime", + "eventhandler:libeventhandler", "hilog:libhilog", + "ipc:ipc_core", + "json:nlohmann_json_static", "napi:ace_napi", ] diff --git a/frameworks/js/napi/dialog_request_info/BUILD.gn b/frameworks/js/napi/dialog_request_info/BUILD.gn index 40087c37ae..9426b3dfd5 100755 --- a/frameworks/js/napi/dialog_request_info/BUILD.gn +++ b/frameworks/js/napi/dialog_request_info/BUILD.gn @@ -31,7 +31,9 @@ ohos_shared_library("dialog_request_info") { "ability_base:base", "ability_base:want", "c_utils:utils", + "ets_runtime:libark_jsruntime", "hilog:libhilog", + "ipc:ipc_core", "napi:ace_napi", ] diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index 98c0e60231..cd6e8e1c1e 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -53,12 +53,19 @@ ohos_shared_library("napi_common") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "ets_runtime:libark_jsruntime", + "eventhandler:libeventhandler", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", + "image_framework:image_native", "ipc:ipc_core", "ipc:ipc_napi", "json:nlohmann_json_static", "libuv:uv", "napi:ace_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] public_external_deps = [ diff --git a/frameworks/js/napi/js_child_process_manager/BUILD.gn b/frameworks/js/napi/js_child_process_manager/BUILD.gn index 87c91c1b6e..109b3cf29f 100644 --- a/frameworks/js/napi/js_child_process_manager/BUILD.gn +++ b/frameworks/js/napi/js_child_process_manager/BUILD.gn @@ -35,9 +35,16 @@ ohos_shared_library("childprocessmanager_napi") { external_deps = [ "ability_base:session_info", + "ability_base:want", + "bundle_framework:appexecfwk_base", "c_utils:utils", + "ets_runtime:libark_jsruntime", + "eventhandler:libeventhandler", "hilog:libhilog", + "ipc:ipc_core", + "jsoncpp:jsoncpp", "napi:ace_napi", + "resource_management:global_resmgr", ] if (ability_runtime_graphics) { diff --git a/frameworks/js/napi/js_dialog_session/BUILD.gn b/frameworks/js/napi/js_dialog_session/BUILD.gn index ca35168eb7..51144d9822 100644 --- a/frameworks/js/napi/js_dialog_session/BUILD.gn +++ b/frameworks/js/napi/js_dialog_session/BUILD.gn @@ -42,15 +42,22 @@ ohos_shared_library("dialogsession_napi") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "ffrt:libffrt", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", + "image_framework:image_native", "init:libbegetutil", "ipc:ipc_core", + "ipc:ipc_napi", "json:nlohmann_json_static", "jsoncpp:jsoncpp", "napi:ace_napi", + "resource_management:global_resmgr", "samgr:samgr_proxy", + "skia:skia_canvaskit", ] cflags_cc = [] diff --git a/frameworks/native/ability/BUILD.gn b/frameworks/native/ability/BUILD.gn index b36077bc02..545f6de98f 100644 --- a/frameworks/native/ability/BUILD.gn +++ b/frameworks/native/ability/BUILD.gn @@ -82,11 +82,18 @@ ohos_shared_library("ability_context_native") { "access_token:libtoken_callback_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "ets_runtime:libark_jsruntime", + "eventhandler:libeventhandler", "faultloggerd:libdfx_dumpcatcher", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", "hitrace:hitrace_meter", + "image_framework:image_native", "ipc:ipc_core", "napi:ace_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] public_external_deps = [ "ability_base:extractortool", diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 25827bd6f0..33036cc377 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -160,10 +160,12 @@ ohos_shared_library("abilitykit_utils") { "json:nlohmann_json_static", "napi:ace_napi", "resource_management:global_resmgr", + "skia:skia_canvaskit", ] public_external_deps = [ "bundle_framework:appexecfwk_core", + "icu:shared_icuuc", "jsoncpp:jsoncpp", "window_manager:libwm", ] @@ -171,7 +173,6 @@ ohos_shared_library("abilitykit_utils") { if (ability_runtime_graphics) { external_deps += [ "ability_base:session_info", - "icu:shared_icuuc", "window_manager:libwm", ] public_external_deps += [ @@ -420,12 +421,17 @@ ohos_shared_library("extensionkit_native") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", + "graphic_2d:2d_graphics", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "ipc:ipc_napi", "json:nlohmann_json_static", "napi:ace_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] public_deps = [ ":abilitykit_utils" ] @@ -480,12 +486,18 @@ ohos_shared_library("insight_intent_executor") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", + "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", "hitrace:hitrace_meter", + "image_framework:image_native", "ipc:ipc_core", "ipc:ipc_napi", "napi:ace_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] subsystem_name = "ability" @@ -861,6 +873,7 @@ ohos_shared_library("ui_service_extension_connection") { "ability_base:want", "access_token:libtokenid_sdk", "c_utils:utils", + "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "ipc:ipc_napi", @@ -1075,15 +1088,18 @@ ohos_shared_library("continuation_ipc") { ] external_deps = [ + "ability_base:session_info", "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "graphic_2d:2d_graphics", "hilog:libhilog", "ipc:ipc_core", "json:nlohmann_json_static", "node:node_header_notice", "resource_management:global_resmgr", + "skia:skia_canvaskit", "window_manager:libwm", ] public_external_deps = [ diff --git a/frameworks/native/ability/native/app_module_checker.cpp b/frameworks/native/ability/native/app_module_checker.cpp index d15b186958..20e0d6fcce 100644 --- a/frameworks/native/ability/native/app_module_checker.cpp +++ b/frameworks/native/ability/native/app_module_checker.cpp @@ -18,6 +18,7 @@ #include "hilog_tag_wrapper.h" #include "module_checker_delegate.h" #include "utils/log.h" +#include bool AppModuleChecker::CheckModuleLoadable(const char *moduleName, std::unique_ptr &apiAllowListChecker) diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 36f1eef7e1..6950c519e2 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -14,7 +14,6 @@ import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//build/templates/abc/ohos_abc.gni") -import("//commonlibrary/memory_utils/purgeable_mem_config.gni") import("//foundation/ability/ability_runtime/ability_runtime.gni") ohos_abc("delegator_mgmt") { @@ -305,14 +304,20 @@ ohos_shared_library("app_context") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "ets_runtime:libark_jsruntime", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", "hitrace:hitrace_meter", + "image_framework:image_native", "init:libbegetutil", "ipc:ipc_core", + "ipc:ipc_napi", "json:nlohmann_json_static", "napi:ace_napi", "resource_management:global_resmgr", "samgr:samgr_proxy", + "skia:skia_canvaskit", ] public_external_deps = [ "ability_base:configuration", @@ -374,13 +379,17 @@ ohos_shared_library("app_context_utils") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "ets_runtime:libark_jsruntime", + "graphic_2d:2d_graphics", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", + "ipc:ipc_napi", "json:nlohmann_json_static", "napi:ace_napi", "resource_management:global_resmgr", "resource_management:resmgr_napi_core", + "skia:skia_canvaskit", ] public_external_deps = [ "ability_base:configuration" ] if (ability_runtime_graphics) { diff --git a/frameworks/native/appkit/ability_runtime/context/context_impl.cpp b/frameworks/native/appkit/ability_runtime/context/context_impl.cpp index 19f2af2c1a..923a0ce52b 100644 --- a/frameworks/native/appkit/ability_runtime/context/context_impl.cpp +++ b/frameworks/native/appkit/ability_runtime/context/context_impl.cpp @@ -1005,12 +1005,12 @@ void ContextImpl::UpdateResConfig(std::shared_ptrSetDeviceType(GetDeviceType()); std::string mcc = config_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_MCC); std::string mnc = config_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_MNC); - try { - resConfig->SetMcc(static_cast(std::stoi(mcc))); - resConfig->SetMnc(static_cast(std::stoi(mnc))); - } catch (...) { - TAG_LOGD(AAFwkTag::APPKIT, "Set mcc,mnc failed mcc:%{public}s mnc:%{public}s", mcc.c_str(), mnc.c_str()); - } + // try { + resConfig->SetMcc(static_cast(std::stoi(mcc))); + resConfig->SetMnc(static_cast(std::stoi(mnc))); + // } catch (...) { + // TAG_LOGD(AAFwkTag::APPKIT, "Set mcc,mnc failed mcc:%{public}s mnc:%{public}s", mcc.c_str(), mnc.c_str()); + // } resourceManager->UpdateResConfig(*resConfig); } diff --git a/frameworks/native/insight_intent/insight_intent_context/BUILD.gn b/frameworks/native/insight_intent/insight_intent_context/BUILD.gn index 7bed55b40c..06a8c2147e 100644 --- a/frameworks/native/insight_intent/insight_intent_context/BUILD.gn +++ b/frameworks/native/insight_intent/insight_intent_context/BUILD.gn @@ -44,10 +44,16 @@ ohos_shared_library("insightintentcontext") { "ability_base:session_info", "ability_base:want", "c_utils:utils", + "ets_runtime:libark_jsruntime", + "graphic_2d:2d_graphics", "hilog:libhilog", "hitrace:hitrace_meter", + "image_framework:image_native", + "ipc:ipc_core", "ipc:ipc_single", "napi:ace_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] subsystem_name = "ability" diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 1610b5d5fa..43cf17ffb0 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -133,14 +133,25 @@ ohos_shared_library("ability_manager") { "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", + "image_framework:image_native", + "input:libmmi-client", "ipc:ipc_core", + "ipc:ipc_napi", + "jsoncpp:jsoncpp", "relational_store:native_dataability", + "relational_store:native_rdb", + "resource_management:global_resmgr", "samgr:samgr_proxy", + "skia:skia_canvaskit", ] + if (host_cpu != "arm64") { external_deps += [ "relational_store:native_rdb" ] } @@ -233,7 +244,9 @@ ohos_shared_library("mission_info") { external_deps = [ "c_utils:utils", + "graphic_2d:2d_graphics", "ipc:ipc_core", + "skia:skia_canvaskit", ] public_external_deps = [ "ability_base:configuration", @@ -263,6 +276,14 @@ ohos_shared_library("ability_manager_c") { external_deps = [ "ability_base:session_info", "c_utils:utils", + "ets_runtime:libark_jsruntime", + "form_fwk:form_manager", + "graphic_2d:2d_graphics", + "image_framework:image_native", + "ipc:ipc_core", + "ipc:ipc_napi", + "resource_management:global_resmgr", + "skia:skia_canvaskit", ] innerapi_tags = [ "platformsdk" ] subsystem_name = "ability" diff --git a/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp index 3975a0ba43..f304f653fa 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp @@ -60,21 +60,21 @@ bool AmsMgrProxy::WriteInterfaceToken(MessageParcel &data) return true; } namespace { -bool WriteTokenObject(MessageParcel &data, sptr token) -{ - if (token) { - if (!data.WriteBool(true) || !data.WriteRemoteObject(token)) { - TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag or token"); - return false; - } - } else { - if (!data.WriteBool(false)) { - TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag"); - return false; - } - } - return true; -} +// bool WriteTokenObject(MessageParcel &data, sptr token) +// { +// if (token) { +// if (!data.WriteBool(true) || !data.WriteRemoteObject(token)) { +// TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag or token"); +// return false; +// } +// } else { +// if (!data.WriteBool(false)) { +// TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag"); +// return false; +// } +// } +// return true; +// } } void AmsMgrProxy::LoadAbility(const std::shared_ptr &abilityInfo, diff --git a/interfaces/inner_api/auto_fill_manager/BUILD.gn b/interfaces/inner_api/auto_fill_manager/BUILD.gn index 90f33ca340..4f71d922c0 100644 --- a/interfaces/inner_api/auto_fill_manager/BUILD.gn +++ b/interfaces/inner_api/auto_fill_manager/BUILD.gn @@ -46,6 +46,7 @@ ohos_shared_library("auto_fill_manager") { "ability_base:base", "ability_base:view_data", "ability_base:want", + "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", diff --git a/interfaces/inner_api/child_process_manager/BUILD.gn b/interfaces/inner_api/child_process_manager/BUILD.gn index e2d990cfae..e7ba9e81d0 100644 --- a/interfaces/inner_api/child_process_manager/BUILD.gn +++ b/interfaces/inner_api/child_process_manager/BUILD.gn @@ -52,6 +52,7 @@ ohos_shared_library("child_process_manager") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", + "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "init:libbegetutil", diff --git a/interfaces/inner_api/deps_wrapper/BUILD.gn b/interfaces/inner_api/deps_wrapper/BUILD.gn index 24c830bfff..f1cd3059ed 100644 --- a/interfaces/inner_api/deps_wrapper/BUILD.gn +++ b/interfaces/inner_api/deps_wrapper/BUILD.gn @@ -42,8 +42,10 @@ ohos_shared_library("ability_deps_wrapper") { external_deps = [ "ability_base:base", + "ability_base:want", "c_utils:utils", "hilog:libhilog", + "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_api/error_utils/BUILD.gn b/interfaces/inner_api/error_utils/BUILD.gn index f54a518f1d..80180f4a4e 100644 --- a/interfaces/inner_api/error_utils/BUILD.gn +++ b/interfaces/inner_api/error_utils/BUILD.gn @@ -36,6 +36,7 @@ ohos_shared_library("ability_runtime_error_util") { external_deps = [ "c_utils:utils", + "ets_runtime:libark_jsruntime", "hilog:libhilog", "napi:ace_napi", ] diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index 2b330c10ad..e1ac30de91 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -101,7 +101,6 @@ ohos_shared_library("runtime") { "c_utils:utils", "config_policy:configpolicy_util", "ets_runtime:libark_jsruntime", - "ets_utils:console", "ets_utils:timer", "eventhandler:libeventhandler", "ffrt:libffrt", @@ -113,6 +112,7 @@ ohos_shared_library("runtime") { "jsoncpp:jsoncpp", "napi:ace_napi", "resource_management:global_resmgr", + "runtime_core:libarkbase_static", "samgr:samgr_proxy", "zlib:shared_libz", ] @@ -120,6 +120,7 @@ ohos_shared_library("runtime") { public_external_deps = [ "ability_base:session_info", "ability_base:want", + "ets_utils:console", ] defines = [] diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index e58a6e61da..d7dba7be16 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -71,6 +71,7 @@ ohos_shared_library("wantagent_innerkits") { external_deps = [ "ability_base:want", "c_utils:utils", + "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/js_environment/frameworks/js_environment/BUILD.gn b/js_environment/frameworks/js_environment/BUILD.gn index 177d74f080..42969f5eb2 100644 --- a/js_environment/frameworks/js_environment/BUILD.gn +++ b/js_environment/frameworks/js_environment/BUILD.gn @@ -40,6 +40,7 @@ ohos_shared_library("js_environment") { public_configs = [ ":public_js_environment_config" ] external_deps = [ + "c_utils:utils", "ets_runtime:libark_jsruntime", "ets_utils:console", "eventhandler:libeventhandler", @@ -47,6 +48,7 @@ ohos_shared_library("js_environment") { "ffrt:libffrt", "hilog:libhilog", "napi:ace_napi", + "runtime_core:libarkbase_static", ] if (ability_runtime_graphics) { diff --git a/service_router_framework/services/srms/BUILD.gn b/service_router_framework/services/srms/BUILD.gn index fc4ed26a2e..7a39d3f68e 100755 --- a/service_router_framework/services/srms/BUILD.gn +++ b/service_router_framework/services/srms/BUILD.gn @@ -63,11 +63,14 @@ ohos_shared_library("libsrms") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", + "graphic_2d:2d_graphics", "hilog:libhilog", + "image_framework:image_native", "ipc:ipc_single", "os_account:os_account_innerkits", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "skia:skia_canvaskit", ] defines = [ "ACCOUNT_ENABLE" ] diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 672cc3e376..85ccb0101c 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -169,6 +169,7 @@ ohos_shared_library("abilityms") { "relational_store:native_appdatafwk", "relational_store:native_dataability", "relational_store:native_rdb", + "resource_management:global_resmgr", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libmodal_system_ui_extension_client", diff --git a/services/abilitymgr/include/dlp_utils.h b/services/abilitymgr/include/dlp_utils.h index a4836bc8a6..f01cf1204f 100644 --- a/services/abilitymgr/include/dlp_utils.h +++ b/services/abilitymgr/include/dlp_utils.h @@ -127,6 +127,7 @@ static bool CheckCallerIsDlpManager(const std::shared_ptr &pids) { - int32_t result = ERR_OK; + // int32_t result = ERR_OK; pid_t foregroundPid = -1; for (const auto &item : appRunningManager_->GetAppRunningRecordMap()) { const auto &appRecord = item.second; diff --git a/services/appmgr/src/app_running_manager.cpp b/services/appmgr/src/app_running_manager.cpp index e850da76a8..5b99acca17 100644 --- a/services/appmgr/src/app_running_manager.cpp +++ b/services/appmgr/src/app_running_manager.cpp @@ -1301,7 +1301,7 @@ bool AppRunningManager::IsNativeArgsChildProcessReachLimit(pid_t callingPid) TAG_LOGE(AAFwkTag::APPMGR, "hostRecord nullptr."); return false; } - int32_t nativeArgsChildCount = 0; + // int32_t nativeArgsChildCount = 0; auto childRecordMap = hostRecord->GetChildProcessRecordMap(); auto count = std::count_if(childRecordMap.begin(), childRecordMap.end(), [](auto &pair) { auto childRecord = pair.second; diff --git a/services/appmgr/src/app_spawn_client.cpp b/services/appmgr/src/app_spawn_client.cpp index 44487f557b..af7f97f38a 100644 --- a/services/appmgr/src/app_spawn_client.cpp +++ b/services/appmgr/src/app_spawn_client.cpp @@ -148,14 +148,14 @@ static std::string DumpAppEnvToJson(const std::map &ap return appEnvJson.dump(); } -static std::string DumpExtensionSandboxDirsToJson(const std::map &extensionSandboxDirs) -{ - nlohmann::json extensionSandboxDirsJson; - for (auto &[userId, sandboxDir] : extensionSandboxDirs) { - extensionSandboxDirsJson[userId] = sandboxDir; - } - return extensionSandboxDirsJson.dump(); -} +// static std::string DumpExtensionSandboxDirsToJson(const std::map &extensionSandboxDirs) +// { +// nlohmann::json extensionSandboxDirsJson; +// for (auto &[userId, sandboxDir] : extensionSandboxDirs) { +// extensionSandboxDirsJson[userId] = sandboxDir; +// } +// return extensionSandboxDirsJson.dump(); +// } int32_t AppSpawnClient::SetDacInfo(const AppSpawnStartMsg &startMsg, AppSpawnReqMsgHandle reqHandle) { diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index b28ecb73ef..1503c8f2bd 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -86,6 +86,7 @@ ohos_shared_library("event_report") { sources = [ "src/event_report.cpp" ] external_deps = [ + "c_utils:utils", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -127,6 +128,7 @@ ohos_shared_library("app_util") { ] external_deps = [ + "c_utils:utils", "config_policy:configpolicy_util", "hilog:libhilog", "hisysevent:libhisysevent", @@ -161,7 +163,9 @@ ohos_shared_library("res_sched_util") { external_deps = [ "bundle_framework:appexecfwk_base", + "c_utils:utils", "hilog:libhilog", + "samgr:samgr_proxy", ] if (resource_schedule_service_enable) { diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index dabae3f00a..8b1ef7ce18 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -250,6 +250,7 @@ ohos_source_set("abilityms_test_source") { "init:libbeget_proxy", "init:libbegetutil", "ipc:ipc_core", + "jsoncpp:jsoncpp", "kv_store:distributeddata_inner", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -292,10 +293,12 @@ ohos_source_set("abilityms_test_source") { ] deps += [ "//third_party/libjpeg-turbo:turbojpeg_static" ] external_deps += [ + "graphic_2d:2d_graphics", "i18n:intl_util", "icu:shared_icuuc", "image_framework:image_native", "input:libmmi-client", + "skia:skia_canvaskit", "window_manager:libdm", "window_manager:libmodal_system_ui_extension_client", "window_manager:libwm", diff --git a/tools/aa/BUILD.gn b/tools/aa/BUILD.gn index 387c550b6e..f03f8add3e 100644 --- a/tools/aa/BUILD.gn +++ b/tools/aa/BUILD.gn @@ -66,9 +66,11 @@ ohos_static_library("tools_aa_source_set") { "bundle_framework:appexecfwk_core", "c_utils:utils", "eventhandler:libeventhandler", + "graphic_2d:2d_graphics", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", + "skia:skia_canvaskit", ] public_external_deps = [ "ability_base:session_info", @@ -100,9 +102,13 @@ ohos_executable("aa") { "ability_base:base", "ability_base:configuration", "ability_base:session_info", + "ability_base:want", + "c_utils:utils", + "graphic_2d:2d_graphics", "hicollie:libhicollie", "hilog:libhilog", "ipc:ipc_core", + "skia:skia_canvaskit", ] symlink_target_name = [ "ability_tool" ] diff --git a/tools/aa/src/ability_command.cpp b/tools/aa/src/ability_command.cpp index 2ed78c987f..f10ccbf371 100644 --- a/tools/aa/src/ability_command.cpp +++ b/tools/aa/src/ability_command.cpp @@ -708,11 +708,11 @@ Reason AbilityManagerShellCommand::CovertExitReason(std::string& reasonStr) pid_t AbilityManagerShellCommand::ConvertPid(std::string& inputPid) { pid_t pid = 0; - try { - pid = static_cast(std::stoi(inputPid)); - } catch (...) { - TAG_LOGW(AAFwkTag::AA_TOOL, "pid stoi(%{public}s) failed", inputPid.c_str()); - } + // try { + pid = static_cast(std::stoi(inputPid)); + // } catch (...) { + // TAG_LOGW(AAFwkTag::AA_TOOL, "pid stoi(%{public}s) failed", inputPid.c_str()); + // } return pid; } diff --git a/utils/server/startup/BUILD.gn b/utils/server/startup/BUILD.gn index 1dda2b6090..41baffc8c7 100644 --- a/utils/server/startup/BUILD.gn +++ b/utils/server/startup/BUILD.gn @@ -53,6 +53,7 @@ ohos_shared_library("startup_util") { "bundle_framework:appexecfwk_base", "c_utils:utils", "ipc:ipc_single", + "ipc:ipc_core", ] innerapi_tags = [ "platformsdk" ] From 2d2740f5f7d1020abd7da149b629f0d3d0e262b3 Mon Sep 17 00:00:00 2001 From: jiangzhijun8 Date: Sun, 29 Sep 2024 10:36:27 +0800 Subject: [PATCH 02/11] Desc:del unused fuc and var for one buildt push -f Signed-off-by: jiangzhijun8 --- frameworks/js/napi/ability/BUILD.gn | 6 +--- .../js/napi/abilityDataUriUtils/BUILD.gn | 6 +--- .../ability_auto_startup_callback/BUILD.gn | 2 +- .../ability_auto_startup_manager/BUILD.gn | 1 - frameworks/js/napi/ability_context/BUILD.gn | 6 +--- frameworks/js/napi/ability_manager/BUILD.gn | 1 - .../js/napi/action_extension_ability/BUILD.gn | 6 +--- .../js/napi/app/ability_delegator/BUILD.gn | 2 -- .../app/ability_lifecycle_callback/BUILD.gn | 8 ++--- frameworks/js/napi/app/ability_stage/BUILD.gn | 11 ++---- .../napi/app/ability_stage_context/BUILD.gn | 6 +--- frameworks/js/napi/app/app_manager/BUILD.gn | 1 - .../js/napi/app/application_context/BUILD.gn | 6 +--- .../BUILD.gn | 6 +--- frameworks/js/napi/app/context/BUILD.gn | 8 ++--- .../js/napi/app/environment_callback/BUILD.gn | 6 +--- frameworks/js/napi/app/error_manager/BUILD.gn | 1 - frameworks/js/napi/app/recovery/BUILD.gn | 1 - .../app/sendable_context_manager/BUILD.gn | 1 - frameworks/js/napi/app/test_runner/BUILD.gn | 5 +-- .../app_startup/async_task_callback/BUILD.gn | 5 +-- .../app_startup/async_task_excutor/BUILD.gn | 6 +--- .../app_startup/startup_config_entry/BUILD.gn | 5 +-- .../app_startup/startup_listener/BUILD.gn | 5 +-- .../js/napi/app_startup/startup_task/BUILD.gn | 5 +-- frameworks/js/napi/application/BUILD.gn | 1 - .../napi/auto_fill_extension_ability/BUILD.gn | 7 ++-- .../napi/auto_fill_extension_context/BUILD.gn | 5 +-- frameworks/js/napi/auto_fill_manager/BUILD.gn | 1 - frameworks/js/napi/callee/BUILD.gn | 5 +-- frameworks/js/napi/caller/BUILD.gn | 6 +--- .../js/napi/dialog_request_info/BUILD.gn | 1 - .../js/napi/embeddable_ui_ability/BUILD.gn | 5 +-- .../embeddable_ui_ability_context/BUILD.gn | 5 +-- .../embedded_ui_extension_ability/BUILD.gn | 5 +-- frameworks/js/napi/extension_ability/BUILD.gn | 5 +-- frameworks/js/napi/extensioncontext/BUILD.gn | 5 +-- frameworks/js/napi/featureAbility/BUILD.gn | 1 - .../napi_data_ability_helper.cpp | 12 +++---- .../napi_data_ability_helper_utils.cpp | 13 ++++--- frameworks/js/napi/feature_ability/BUILD.gn | 1 - .../napi/inner/napi_ability_common/BUILD.gn | 1 - frameworks/js/napi/inner/napi_common/BUILD.gn | 2 +- .../insight_intent/insight_intent/BUILD.gn | 1 - .../insight_intent_driver/BUILD.gn | 1 - .../insight_intent_executor/BUILD.gn | 5 +-- frameworks/js/napi/js_child_process/BUILD.gn | 5 +-- .../js/napi/js_child_process_manager/BUILD.gn | 1 - frameworks/js/napi/js_dialog_request/BUILD.gn | 1 - frameworks/js/napi/js_dialog_session/BUILD.gn | 2 +- .../js/napi/js_mission_manager/BUILD.gn | 1 - frameworks/js/napi/mission_manager/BUILD.gn | 2 -- frameworks/js/napi/particleAbility/BUILD.gn | 1 - .../photo_editor_extension_ability/BUILD.gn | 5 +-- .../photo_editor_extension_context/BUILD.gn | 7 ++-- frameworks/js/napi/quick_fix/BUILD.gn | 1 - .../napi/service_extension_ability/BUILD.gn | 10 ++---- .../napi/service_extension_context/BUILD.gn | 5 +-- .../js/napi/share_extension_ability/BUILD.gn | 5 +-- .../js/napi/ui_extension_ability/BUILD.gn | 5 +-- .../js/napi/ui_extension_context/BUILD.gn | 5 +-- .../ui_service_extension_ability/BUILD.gn | 10 ++---- .../ui_service_extension_context/BUILD.gn | 7 ++-- frameworks/js/napi/uri_permission/BUILD.gn | 1 - frameworks/js/napi/wantagent/BUILD.gn | 1 - .../wantagent/ability_want_agent/BUILD.gn | 1 - frameworks/native/ability/BUILD.gn | 1 - frameworks/native/ability/native/BUILD.gn | 20 +++-------- frameworks/native/appkit/BUILD.gn | 7 ++-- .../ability_runtime/context/context_impl.cpp | 12 +++---- .../native/appkit/app/application_cleaner.cpp | 2 +- .../native/appkit/app/ohos_application.cpp | 2 +- .../native/appkit/dfr/appfreeze_inner.cpp | 6 ++-- .../insight_intent_context/BUILD.gn | 1 - .../runtime/ohos_js_environment_impl.cpp | 6 ++-- frameworks/simulator/BUILD.gn | 8 ++--- .../simulator/ability_simulator/BUILD.gn | 2 +- .../ability_simulator/src/simulator.cpp | 4 +-- interfaces/inner_api/ability_manager/BUILD.gn | 2 -- .../app_manager/src/appmgr/ams_mgr_proxy.cpp | 30 ++++++++-------- .../inner_api/child_process_manager/BUILD.gn | 1 - interfaces/inner_api/error_utils/BUILD.gn | 1 - interfaces/inner_api/quick_fix/BUILD.gn | 2 +- interfaces/inner_api/runtime/BUILD.gn | 1 + interfaces/inner_api/wantagent/BUILD.gn | 1 - .../ability_runtime/authorization_result.h | 2 +- .../js_environment/src/js_environment.cpp | 2 +- services/abilitymgr/include/dlp_utils.h | 34 +++++++++---------- .../abilitymgr/src/ability_cache_manager.cpp | 2 +- .../src/ability_connect_manager.cpp | 10 +++--- .../src/ability_manager_service.cpp | 23 ++++--------- .../abilitymgr/src/free_install_manager.cpp | 2 +- .../src/insight_intent_execute_param.cpp | 12 +++---- .../interceptor/disposed_rule_interceptor.cpp | 2 +- .../src/mission/mission_list_manager.cpp | 10 +++--- .../src/rdb/ability_resident_process_rdb.cpp | 2 +- .../ui_ability_lifecycle_manager.cpp | 4 +-- services/appmgr/src/ams_mgr_scheduler.cpp | 6 ++-- services/appmgr/src/app_mgr_service.cpp | 7 +--- services/appmgr/src/app_mgr_service_inner.cpp | 14 ++++---- services/appmgr/src/app_spawn_client.cpp | 16 ++++----- .../src/exit_resident_process_manager.cpp | 2 +- tools/aa/src/ability_command.cpp | 10 +++--- 103 files changed, 178 insertions(+), 371 deletions(-) diff --git a/frameworks/js/napi/ability/BUILD.gn b/frameworks/js/napi/ability/BUILD.gn index 0ebefddd1a..f0d62f746f 100644 --- a/frameworks/js/napi/ability/BUILD.gn +++ b/frameworks/js/napi/ability/BUILD.gn @@ -48,11 +48,7 @@ template("ohos_ability_napi") { ":ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/abilityDataUriUtils/BUILD.gn b/frameworks/js/napi/abilityDataUriUtils/BUILD.gn index 53960833d4..b0a1bd7857 100644 --- a/frameworks/js/napi/abilityDataUriUtils/BUILD.gn +++ b/frameworks/js/napi/abilityDataUriUtils/BUILD.gn @@ -42,11 +42,7 @@ ohos_shared_library("datauriutils") { ":ability_data_uri_utils_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn b/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn index 5af0b5ef66..a09def79a3 100644 --- a/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn +++ b/frameworks/js/napi/ability_auto_startup_callback/BUILD.gn @@ -40,11 +40,11 @@ ohos_shared_library("autostartupcallback") { external_deps = [ "ability_base:session_info", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", + "window_manager:libwm" ] if (ability_runtime_graphics) { diff --git a/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn b/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn index 2ee89dbcb1..964d6e3fe9 100644 --- a/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn +++ b/frameworks/js/napi/ability_auto_startup_manager/BUILD.gn @@ -44,7 +44,6 @@ ohos_shared_library("autostartupmanager") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/frameworks/js/napi/ability_context/BUILD.gn b/frameworks/js/napi/ability_context/BUILD.gn index 980548a3d1..e3bf547c57 100644 --- a/frameworks/js/napi/ability_context/BUILD.gn +++ b/frameworks/js/napi/ability_context/BUILD.gn @@ -42,11 +42,7 @@ ohos_shared_library("abilitycontext_napi") { ":ability_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/ability_manager/BUILD.gn b/frameworks/js/napi/ability_manager/BUILD.gn index 934909fb7d..2c4d636bcb 100644 --- a/frameworks/js/napi/ability_manager/BUILD.gn +++ b/frameworks/js/napi/ability_manager/BUILD.gn @@ -50,7 +50,6 @@ template("abilitymanager") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "icu:shared_icuuc", diff --git a/frameworks/js/napi/action_extension_ability/BUILD.gn b/frameworks/js/napi/action_extension_ability/BUILD.gn index 73f954cc53..0553ca9e05 100755 --- a/frameworks/js/napi/action_extension_ability/BUILD.gn +++ b/frameworks/js/napi/action_extension_ability/BUILD.gn @@ -42,11 +42,7 @@ ohos_shared_library("actionextensionability_napi") { ":action_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/ability_delegator/BUILD.gn b/frameworks/js/napi/app/ability_delegator/BUILD.gn index b11dcde0e0..d79b7ea6cc 100644 --- a/frameworks/js/napi/app/ability_delegator/BUILD.gn +++ b/frameworks/js/napi/app/ability_delegator/BUILD.gn @@ -53,13 +53,11 @@ template("delegator") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "napi:ace_napi", "ipc:ipc_napi", - # "resource_management:global_resmgr", ] cflags_cc = [] diff --git a/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn b/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn index 4729e0a6be..0c9e9fc84d 100644 --- a/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn +++ b/frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn @@ -42,12 +42,8 @@ ohos_shared_library("abilitylifecyclecallback") { ":ability_lifecycle_callback_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] - + external_deps = [ "napi:ace_napi" ] + relative_install_dir = "module/app/ability" subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/app/ability_stage/BUILD.gn b/frameworks/js/napi/app/ability_stage/BUILD.gn index 75cc09e939..8379ecdda4 100644 --- a/frameworks/js/napi/app/ability_stage/BUILD.gn +++ b/frameworks/js/napi/app/ability_stage/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("abilitystage") { ":ability_stage_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] defines = [ "ENABLE_ERRCODE" ] @@ -62,11 +59,7 @@ ohos_shared_library("abilitystage_napi") { ":ability_stage_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/ability_stage_context/BUILD.gn b/frameworks/js/napi/app/ability_stage_context/BUILD.gn index 09f74b0b11..c0508957bb 100644 --- a/frameworks/js/napi/app/ability_stage_context/BUILD.gn +++ b/frameworks/js/napi/app/ability_stage_context/BUILD.gn @@ -42,11 +42,7 @@ ohos_shared_library("abilitystagecontext_napi") { ":ability_stage_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/app_manager/BUILD.gn b/frameworks/js/napi/app/app_manager/BUILD.gn index b66e4fc5a2..34cf5af97d 100644 --- a/frameworks/js/napi/app/app_manager/BUILD.gn +++ b/frameworks/js/napi/app/app_manager/BUILD.gn @@ -42,7 +42,6 @@ ohos_shared_library("appmanager_napi") { external_deps = [ "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/frameworks/js/napi/app/application_context/BUILD.gn b/frameworks/js/napi/app/application_context/BUILD.gn index 3dd0c0772f..27c5067d6c 100644 --- a/frameworks/js/napi/app/application_context/BUILD.gn +++ b/frameworks/js/napi/app/application_context/BUILD.gn @@ -42,11 +42,7 @@ ohos_shared_library("applicationcontext_napi") { ":application_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/application_state_change_callback/BUILD.gn b/frameworks/js/napi/app/application_state_change_callback/BUILD.gn index 58709423a0..39fc58e92a 100644 --- a/frameworks/js/napi/app/application_state_change_callback/BUILD.gn +++ b/frameworks/js/napi/app/application_state_change_callback/BUILD.gn @@ -44,11 +44,7 @@ ohos_shared_library("applicationstatechangecallback") { ":application_state_change_callback_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/context/BUILD.gn b/frameworks/js/napi/app/context/BUILD.gn index d51dc606bd..f9070ecf36 100644 --- a/frameworks/js/napi/app/context/BUILD.gn +++ b/frameworks/js/napi/app/context/BUILD.gn @@ -41,12 +41,8 @@ ohos_shared_library("context_napi") { ":context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] - + external_deps = [ "napi:ace_napi" ] + relative_install_dir = "module/application" subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/app/environment_callback/BUILD.gn b/frameworks/js/napi/app/environment_callback/BUILD.gn index 85adc007e2..4aefb70ebe 100644 --- a/frameworks/js/napi/app/environment_callback/BUILD.gn +++ b/frameworks/js/napi/app/environment_callback/BUILD.gn @@ -42,11 +42,7 @@ ohos_shared_library("environmentcallback") { ":environment_callback_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - "runtime_core:libarkfile_static", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/app/error_manager/BUILD.gn b/frameworks/js/napi/app/error_manager/BUILD.gn index d0562cd334..549a7041f7 100644 --- a/frameworks/js/napi/app/error_manager/BUILD.gn +++ b/frameworks/js/napi/app/error_manager/BUILD.gn @@ -42,7 +42,6 @@ template("errormanager") { external_deps = [ "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "napi:ace_napi", diff --git a/frameworks/js/napi/app/recovery/BUILD.gn b/frameworks/js/napi/app/recovery/BUILD.gn index 2a0d7162ef..757c0f0e6e 100644 --- a/frameworks/js/napi/app/recovery/BUILD.gn +++ b/frameworks/js/napi/app/recovery/BUILD.gn @@ -46,7 +46,6 @@ ohos_shared_library("apprecovery_napi") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "napi:ace_napi", diff --git a/frameworks/js/napi/app/sendable_context_manager/BUILD.gn b/frameworks/js/napi/app/sendable_context_manager/BUILD.gn index 8d00c43c98..4a428dec7e 100644 --- a/frameworks/js/napi/app/sendable_context_manager/BUILD.gn +++ b/frameworks/js/napi/app/sendable_context_manager/BUILD.gn @@ -52,7 +52,6 @@ ohos_shared_library("sendablecontextmanager_napi") { "ability_base:want", "bundle_framework:appexecfwk_base", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "napi:ace_napi", diff --git a/frameworks/js/napi/app/test_runner/BUILD.gn b/frameworks/js/napi/app/test_runner/BUILD.gn index d63b58b7bb..4d9da6349c 100644 --- a/frameworks/js/napi/app/test_runner/BUILD.gn +++ b/frameworks/js/napi/app/test_runner/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("testrunner_napi") { ":test_runner_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/app_startup/async_task_callback/BUILD.gn b/frameworks/js/napi/app_startup/async_task_callback/BUILD.gn index 921d516a35..e1fd83af61 100644 --- a/frameworks/js/napi/app_startup/async_task_callback/BUILD.gn +++ b/frameworks/js/napi/app_startup/async_task_callback/BUILD.gn @@ -53,10 +53,7 @@ ohos_shared_library("asynctaskcallback_napi") { ":async_task_callback_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/appstartup" subsystem_name = "ability" diff --git a/frameworks/js/napi/app_startup/async_task_excutor/BUILD.gn b/frameworks/js/napi/app_startup/async_task_excutor/BUILD.gn index 3d0ca72b8c..e9d42eb088 100644 --- a/frameworks/js/napi/app_startup/async_task_excutor/BUILD.gn +++ b/frameworks/js/napi/app_startup/async_task_excutor/BUILD.gn @@ -53,11 +53,7 @@ ohos_shared_library("asynctaskexcutor_napi") { ":async_task_excutor_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] - + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/appstartup" subsystem_name = "ability" diff --git a/frameworks/js/napi/app_startup/startup_config_entry/BUILD.gn b/frameworks/js/napi/app_startup/startup_config_entry/BUILD.gn index d7b7735ad5..61c9b11786 100644 --- a/frameworks/js/napi/app_startup/startup_config_entry/BUILD.gn +++ b/frameworks/js/napi/app_startup/startup_config_entry/BUILD.gn @@ -53,10 +53,7 @@ ohos_shared_library("startupconfigentry_napi") { ":startup_config_entry_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/appstartup" subsystem_name = "ability" diff --git a/frameworks/js/napi/app_startup/startup_listener/BUILD.gn b/frameworks/js/napi/app_startup/startup_listener/BUILD.gn index a57635ee16..b846d2f744 100644 --- a/frameworks/js/napi/app_startup/startup_listener/BUILD.gn +++ b/frameworks/js/napi/app_startup/startup_listener/BUILD.gn @@ -53,10 +53,7 @@ ohos_shared_library("startuplistener_napi") { ":startup_listener_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/appstartup" subsystem_name = "ability" diff --git a/frameworks/js/napi/app_startup/startup_task/BUILD.gn b/frameworks/js/napi/app_startup/startup_task/BUILD.gn index ccb9e3bfcc..6bcfee46f2 100644 --- a/frameworks/js/napi/app_startup/startup_task/BUILD.gn +++ b/frameworks/js/napi/app_startup/startup_task/BUILD.gn @@ -53,10 +53,7 @@ ohos_shared_library("startuptask_napi") { ":startup_task_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/appstartup" subsystem_name = "ability" diff --git a/frameworks/js/napi/application/BUILD.gn b/frameworks/js/napi/application/BUILD.gn index d5343c5d7f..6e38f0181c 100644 --- a/frameworks/js/napi/application/BUILD.gn +++ b/frameworks/js/napi/application/BUILD.gn @@ -54,7 +54,6 @@ ohos_shared_library("application_napi") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/frameworks/js/napi/auto_fill_extension_ability/BUILD.gn b/frameworks/js/napi/auto_fill_extension_ability/BUILD.gn index 2d557885ca..34dea8f399 100644 --- a/frameworks/js/napi/auto_fill_extension_ability/BUILD.gn +++ b/frameworks/js/napi/auto_fill_extension_ability/BUILD.gn @@ -42,11 +42,8 @@ ohos_shared_library("autofillextensionability_napi") { ":auto_fill_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] - + external_deps = [ "napi:ace_napi" ] + relative_install_dir = "module/app/ability" subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/auto_fill_extension_context/BUILD.gn b/frameworks/js/napi/auto_fill_extension_context/BUILD.gn index 0dcc679d70..cdb3cee610 100755 --- a/frameworks/js/napi/auto_fill_extension_context/BUILD.gn +++ b/frameworks/js/napi/auto_fill_extension_context/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("autofillextensioncontext_napi") { ":auto_fill_extension_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/auto_fill_manager/BUILD.gn b/frameworks/js/napi/auto_fill_manager/BUILD.gn index b70e3e6419..18a9d7e7b8 100644 --- a/frameworks/js/napi/auto_fill_manager/BUILD.gn +++ b/frameworks/js/napi/auto_fill_manager/BUILD.gn @@ -39,7 +39,6 @@ ohos_shared_library("autofillmanager_napi") { "ability_base:view_data", "ability_base:want", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/frameworks/js/napi/callee/BUILD.gn b/frameworks/js/napi/callee/BUILD.gn index 2e06c9f3ef..802a96d09b 100644 --- a/frameworks/js/napi/callee/BUILD.gn +++ b/frameworks/js/napi/callee/BUILD.gn @@ -41,10 +41,7 @@ ohos_shared_library("callee_napi") { ":callee_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/caller/BUILD.gn b/frameworks/js/napi/caller/BUILD.gn index 206374d4aa..6b07666ece 100644 --- a/frameworks/js/napi/caller/BUILD.gn +++ b/frameworks/js/napi/caller/BUILD.gn @@ -41,11 +41,7 @@ ohos_shared_library("caller_napi") { ":caller_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] - + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/dialog_request_info/BUILD.gn b/frameworks/js/napi/dialog_request_info/BUILD.gn index bc7f592490..2ea20b912d 100755 --- a/frameworks/js/napi/dialog_request_info/BUILD.gn +++ b/frameworks/js/napi/dialog_request_info/BUILD.gn @@ -33,7 +33,6 @@ ohos_shared_library("dialog_request_info") { "ability_base:base", "ability_base:want", "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/frameworks/js/napi/embeddable_ui_ability/BUILD.gn b/frameworks/js/napi/embeddable_ui_ability/BUILD.gn index 6263d23e5f..a0ba11cdd6 100644 --- a/frameworks/js/napi/embeddable_ui_ability/BUILD.gn +++ b/frameworks/js/napi/embeddable_ui_ability/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("embeddableuiability_napi") { ":embeddable_ui_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/embeddable_ui_ability_context/BUILD.gn b/frameworks/js/napi/embeddable_ui_ability_context/BUILD.gn index 05ce1f952a..025fab8fd7 100644 --- a/frameworks/js/napi/embeddable_ui_ability_context/BUILD.gn +++ b/frameworks/js/napi/embeddable_ui_ability_context/BUILD.gn @@ -43,10 +43,7 @@ ohos_shared_library("embeddableuiabilitycontext_napi") { ":embeddable_ui_ability_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/embedded_ui_extension_ability/BUILD.gn b/frameworks/js/napi/embedded_ui_extension_ability/BUILD.gn index de13d2f139..65b1758bde 100755 --- a/frameworks/js/napi/embedded_ui_extension_ability/BUILD.gn +++ b/frameworks/js/napi/embedded_ui_extension_ability/BUILD.gn @@ -54,10 +54,7 @@ ohos_shared_library("embeddeduiextensionability_napi") { ":embedded_ui_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/extension_ability/BUILD.gn b/frameworks/js/napi/extension_ability/BUILD.gn index cbc789f8cd..f5e6b15ae9 100644 --- a/frameworks/js/napi/extension_ability/BUILD.gn +++ b/frameworks/js/napi/extension_ability/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("extensionability_napi") { ":extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/extensioncontext/BUILD.gn b/frameworks/js/napi/extensioncontext/BUILD.gn index a65de2cf7f..512f486185 100644 --- a/frameworks/js/napi/extensioncontext/BUILD.gn +++ b/frameworks/js/napi/extensioncontext/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("extensioncontext_napi") { ":extension_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/featureAbility/BUILD.gn b/frameworks/js/napi/featureAbility/BUILD.gn index 83f776f82b..7023b33af6 100644 --- a/frameworks/js/napi/featureAbility/BUILD.gn +++ b/frameworks/js/napi/featureAbility/BUILD.gn @@ -75,7 +75,6 @@ ohos_shared_library("featureability") { "data_ability/napi_result_set.cpp", ] external_deps += [ - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "kv_store:distributeddata_mgr", "relational_store:native_appdatafwk", diff --git a/frameworks/js/napi/featureAbility/napi_data_ability_helper.cpp b/frameworks/js/napi/featureAbility/napi_data_ability_helper.cpp index c879f397b6..d155a0acee 100644 --- a/frameworks/js/napi/featureAbility/napi_data_ability_helper.cpp +++ b/frameworks/js/napi/featureAbility/napi_data_ability_helper.cpp @@ -996,12 +996,12 @@ napi_value DenormalizeUriWrap(napi_env env, napi_callback_info info, DAHelperDen void UnwrapDataAbilityPredicates(NativeRdb::DataAbilityPredicates &predicates, napi_env env, napi_value value) { - // auto tempPredicates = DataAbilityJsKit::DataAbilityPredicatesProxy::GetNativePredicates(env, value); - // if (tempPredicates == nullptr) { - // TAG_LOGE(AAFwkTag::FA, "null tempPredicates"); - // return; - // } - // predicates = *tempPredicates; + auto tempPredicates = DataAbilityJsKit::DataAbilityPredicatesProxy::GetNativePredicates(env, value); + if (tempPredicates == nullptr) { + TAG_LOGE(AAFwkTag::FA, "null tempPredicates"); + return; + } + predicates = *tempPredicates; } /** diff --git a/frameworks/js/napi/featureAbility/napi_data_ability_helper_utils.cpp b/frameworks/js/napi/featureAbility/napi_data_ability_helper_utils.cpp index ae0956dd5a..4b6b9c2fc5 100644 --- a/frameworks/js/napi/featureAbility/napi_data_ability_helper_utils.cpp +++ b/frameworks/js/napi/featureAbility/napi_data_ability_helper_utils.cpp @@ -1577,14 +1577,13 @@ napi_value QueryPromise(napi_env env, DAHelperQueryCB *queryCB) napi_value WrapResultSet(napi_env env, const std::shared_ptr &resultSet) { - // TAG_LOGD(AAFwkTag::FA, "called"); - // if (resultSet == nullptr) { - // TAG_LOGE(AAFwkTag::FA, "null resultSet"); - // return WrapVoidToJS(env); - // } + TAG_LOGD(AAFwkTag::FA, "called"); + if (resultSet == nullptr) { + TAG_LOGE(AAFwkTag::FA, "null resultSet"); + return WrapVoidToJS(env); + } - // return RdbJsKit::ResultSetProxy::NewInstance(env, resultSet); - return WrapVoidToJS(env); + return RdbJsKit::ResultSetProxy::NewInstance(env, resultSet); } napi_value ExecuteBatchAsync( diff --git a/frameworks/js/napi/feature_ability/BUILD.gn b/frameworks/js/napi/feature_ability/BUILD.gn index d2688abcb8..d85fae49c6 100644 --- a/frameworks/js/napi/feature_ability/BUILD.gn +++ b/frameworks/js/napi/feature_ability/BUILD.gn @@ -37,7 +37,6 @@ ohos_shared_library("featureability_napi") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "napi:ace_napi", diff --git a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn index e8b0cecd75..e8b3ee8390 100644 --- a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("napi_ability_common") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "ipc:ipc_napi", diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index 0773ea0e18..ae33049201 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -55,7 +55,6 @@ ohos_shared_library("napi_common") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", @@ -63,6 +62,7 @@ ohos_shared_library("napi_common") { "json:nlohmann_json_static", "libuv:uv", "napi:ace_napi", + "window_manager:libwm", ] public_external_deps = [ diff --git a/frameworks/js/napi/insight_intent/insight_intent/BUILD.gn b/frameworks/js/napi/insight_intent/insight_intent/BUILD.gn index a366c3ae9c..b4b106633e 100644 --- a/frameworks/js/napi/insight_intent/insight_intent/BUILD.gn +++ b/frameworks/js/napi/insight_intent/insight_intent/BUILD.gn @@ -33,7 +33,6 @@ ohos_shared_library("insightintent_napi") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/frameworks/js/napi/insight_intent/insight_intent_driver/BUILD.gn b/frameworks/js/napi/insight_intent/insight_intent_driver/BUILD.gn index a12339a7dc..dcc0986299 100644 --- a/frameworks/js/napi/insight_intent/insight_intent_driver/BUILD.gn +++ b/frameworks/js/napi/insight_intent/insight_intent_driver/BUILD.gn @@ -37,7 +37,6 @@ ohos_shared_library("insightintentdriver_napi") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/frameworks/js/napi/insight_intent/insight_intent_executor/BUILD.gn b/frameworks/js/napi/insight_intent/insight_intent_executor/BUILD.gn index 525a9be1cc..add8c609eb 100644 --- a/frameworks/js/napi/insight_intent/insight_intent_executor/BUILD.gn +++ b/frameworks/js/napi/insight_intent/insight_intent_executor/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("insightintentexecutor_napi") { ":insight_intent_executor_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/js_child_process/BUILD.gn b/frameworks/js/napi/js_child_process/BUILD.gn index 3e0d7dbe2e..f3402e8fdc 100644 --- a/frameworks/js/napi/js_child_process/BUILD.gn +++ b/frameworks/js/napi/js_child_process/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("childprocess_napi") { ":child_process_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/js_child_process_manager/BUILD.gn b/frameworks/js/napi/js_child_process_manager/BUILD.gn index 09ce5c6b0b..a74aa198d5 100644 --- a/frameworks/js/napi/js_child_process_manager/BUILD.gn +++ b/frameworks/js/napi/js_child_process_manager/BUILD.gn @@ -35,7 +35,6 @@ ohos_shared_library("childprocessmanager_napi") { external_deps = [ "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/frameworks/js/napi/js_dialog_request/BUILD.gn b/frameworks/js/napi/js_dialog_request/BUILD.gn index 62310a7ed7..20fa32d6cd 100755 --- a/frameworks/js/napi/js_dialog_request/BUILD.gn +++ b/frameworks/js/napi/js_dialog_request/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("dialogrequest_napi") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "ipc:ipc_napi", diff --git a/frameworks/js/napi/js_dialog_session/BUILD.gn b/frameworks/js/napi/js_dialog_session/BUILD.gn index c901bb73a3..fe6117de3e 100644 --- a/frameworks/js/napi/js_dialog_session/BUILD.gn +++ b/frameworks/js/napi/js_dialog_session/BUILD.gn @@ -41,7 +41,6 @@ ohos_shared_library("dialogsession_napi") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", @@ -50,6 +49,7 @@ ohos_shared_library("dialogsession_napi") { "ipc:ipc_napi", "napi:ace_napi", "samgr:samgr_proxy", + "window_manager:libwm", ] cflags_cc = [] diff --git a/frameworks/js/napi/js_mission_manager/BUILD.gn b/frameworks/js/napi/js_mission_manager/BUILD.gn index 6c8ef29468..ded57275cb 100755 --- a/frameworks/js/napi/js_mission_manager/BUILD.gn +++ b/frameworks/js/napi/js_mission_manager/BUILD.gn @@ -41,7 +41,6 @@ ohos_shared_library("missionmanager") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", diff --git a/frameworks/js/napi/mission_manager/BUILD.gn b/frameworks/js/napi/mission_manager/BUILD.gn index 4f895a2791..4809eefeea 100644 --- a/frameworks/js/napi/mission_manager/BUILD.gn +++ b/frameworks/js/napi/mission_manager/BUILD.gn @@ -40,7 +40,6 @@ ohos_shared_library("missionmanager_napi") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", @@ -103,7 +102,6 @@ ohos_shared_library("distributedmissionmanager") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "init:libbegetutil", diff --git a/frameworks/js/napi/particleAbility/BUILD.gn b/frameworks/js/napi/particleAbility/BUILD.gn index ac9ca67d20..ff36e4f04a 100644 --- a/frameworks/js/napi/particleAbility/BUILD.gn +++ b/frameworks/js/napi/particleAbility/BUILD.gn @@ -70,7 +70,6 @@ ohos_shared_library("particleability") { "../featureAbility/data_ability/napi_result_set.cpp", ] external_deps += [ - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "kv_store:distributeddata_mgr", "relational_store:native_appdatafwk", diff --git a/frameworks/js/napi/photo_editor_extension_ability/BUILD.gn b/frameworks/js/napi/photo_editor_extension_ability/BUILD.gn index d7037db542..ae87a44f9f 100755 --- a/frameworks/js/napi/photo_editor_extension_ability/BUILD.gn +++ b/frameworks/js/napi/photo_editor_extension_ability/BUILD.gn @@ -53,10 +53,7 @@ ohos_shared_library("photoeditorextensionability_napi") { ":photo_editor_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/photo_editor_extension_context/BUILD.gn b/frameworks/js/napi/photo_editor_extension_context/BUILD.gn index e10d72afd0..199a24d25b 100755 --- a/frameworks/js/napi/photo_editor_extension_context/BUILD.gn +++ b/frameworks/js/napi/photo_editor_extension_context/BUILD.gn @@ -53,11 +53,8 @@ ohos_shared_library("photoeditorextensioncontext_napi") { ":photo_editor_extension_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] - + external_deps = [ "napi:ace_napi" ] + relative_install_dir = "module/application" subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/quick_fix/BUILD.gn b/frameworks/js/napi/quick_fix/BUILD.gn index c53f19c7f9..bb8386d30f 100644 --- a/frameworks/js/napi/quick_fix/BUILD.gn +++ b/frameworks/js/napi/quick_fix/BUILD.gn @@ -38,7 +38,6 @@ ohos_shared_library("quickfixmanager_napi") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "napi:ace_napi", diff --git a/frameworks/js/napi/service_extension_ability/BUILD.gn b/frameworks/js/napi/service_extension_ability/BUILD.gn index 1b4083b482..91abec9b79 100644 --- a/frameworks/js/napi/service_extension_ability/BUILD.gn +++ b/frameworks/js/napi/service_extension_ability/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("serviceextensionability_napi") { ":service_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" @@ -60,10 +57,7 @@ ohos_shared_library("serviceextensionability") { ":service_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] defines = [ "ENABLE_ERRCODE" ] diff --git a/frameworks/js/napi/service_extension_context/BUILD.gn b/frameworks/js/napi/service_extension_context/BUILD.gn index 0896b8c360..84cd644117 100644 --- a/frameworks/js/napi/service_extension_context/BUILD.gn +++ b/frameworks/js/napi/service_extension_context/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("serviceextensioncontext_napi") { ":service_extension_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/share_extension_ability/BUILD.gn b/frameworks/js/napi/share_extension_ability/BUILD.gn index d5d8619c76..9388f58551 100755 --- a/frameworks/js/napi/share_extension_ability/BUILD.gn +++ b/frameworks/js/napi/share_extension_ability/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("shareextensionability_napi") { ":share_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/ui_extension_ability/BUILD.gn b/frameworks/js/napi/ui_extension_ability/BUILD.gn index 30930ff0ad..af23dfd573 100755 --- a/frameworks/js/napi/ui_extension_ability/BUILD.gn +++ b/frameworks/js/napi/ui_extension_ability/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("uiextensionability_napi") { ":ui_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/app/ability" subsystem_name = "ability" diff --git a/frameworks/js/napi/ui_extension_context/BUILD.gn b/frameworks/js/napi/ui_extension_context/BUILD.gn index 9df05beaff..e49ad18138 100755 --- a/frameworks/js/napi/ui_extension_context/BUILD.gn +++ b/frameworks/js/napi/ui_extension_context/BUILD.gn @@ -42,10 +42,7 @@ ohos_shared_library("uiextensioncontext_napi") { ":ui_extension_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" diff --git a/frameworks/js/napi/ui_service_extension_ability/BUILD.gn b/frameworks/js/napi/ui_service_extension_ability/BUILD.gn index 97d193d98f..35981050ec 100644 --- a/frameworks/js/napi/ui_service_extension_ability/BUILD.gn +++ b/frameworks/js/napi/ui_service_extension_ability/BUILD.gn @@ -53,10 +53,7 @@ ohos_shared_library("uiserviceextensionability_napi") { ":ui_service_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] relative_install_dir = "module/application" subsystem_name = "ability" @@ -82,10 +79,7 @@ ohos_shared_library("uiserviceextensionability") { ":ui_service_extension_ability_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] + external_deps = [ "napi:ace_napi" ] defines = [ "ENABLE_ERRCODE" ] diff --git a/frameworks/js/napi/ui_service_extension_context/BUILD.gn b/frameworks/js/napi/ui_service_extension_context/BUILD.gn index 0e9a51b644..23e7f4078d 100644 --- a/frameworks/js/napi/ui_service_extension_context/BUILD.gn +++ b/frameworks/js/napi/ui_service_extension_context/BUILD.gn @@ -53,11 +53,8 @@ ohos_shared_library("uiserviceextensioncontext_napi") { ":ui_service_extension_context_js", ] - external_deps = [ - "napi:ace_napi", - "ets_runtime:libark_jsruntime", - ] - + external_deps = [ "napi:ace_napi" ] + relative_install_dir = "module/application" subsystem_name = "ability" part_name = "ability_runtime" diff --git a/frameworks/js/napi/uri_permission/BUILD.gn b/frameworks/js/napi/uri_permission/BUILD.gn index 6595a7e0b3..ff699deffa 100644 --- a/frameworks/js/napi/uri_permission/BUILD.gn +++ b/frameworks/js/napi/uri_permission/BUILD.gn @@ -38,7 +38,6 @@ ohos_shared_library("uripermissionmanager_napi") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "init:libbegetutil", diff --git a/frameworks/js/napi/wantagent/BUILD.gn b/frameworks/js/napi/wantagent/BUILD.gn index b07ef47c35..543f70cb9f 100644 --- a/frameworks/js/napi/wantagent/BUILD.gn +++ b/frameworks/js/napi/wantagent/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("wantagent") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "libuv:uv", diff --git a/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn b/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn index ca4548efac..bdde0232e8 100644 --- a/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn +++ b/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("wantagent_napi") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "libuv:uv", diff --git a/frameworks/native/ability/BUILD.gn b/frameworks/native/ability/BUILD.gn index ec73d741db..3dab9c55b3 100644 --- a/frameworks/native/ability/BUILD.gn +++ b/frameworks/native/ability/BUILD.gn @@ -84,7 +84,6 @@ ohos_shared_library("ability_context_native") { "access_token:libtoken_callback_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "faultloggerd:libdfx_dumpcatcher", "hilog:libhilog", diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index bf16b6ddc3..5bc7c4d37a 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -331,12 +331,12 @@ ohos_shared_library("abilitykit_native") { "ability_base:want", "ability_base:zuri", "access_token:libaccesstoken_sdk", + "access_token:libtoken_callback_sdk", "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -349,6 +349,7 @@ ohos_shared_library("abilitykit_native") { "node:node_header_notice", "resource_management:global_resmgr", "samgr:samgr_proxy", + "window_manager:windowstage_kit", ] if (!(host_os == "linux" && host_cpu == "arm64")) { external_deps += [ "relational_store:native_rdb" ] @@ -413,7 +414,6 @@ ohos_shared_library("abilitykit_native") { "input:libmmi-client", "window_manager:libwm", "window_manager:libwsutils", - "window_manager:windowstage_kit", ] public_external_deps += [ @@ -486,7 +486,6 @@ ohos_shared_library("extensionkit_native") { "ability_base:want", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", @@ -547,13 +546,13 @@ ohos_shared_library("insight_intent_executor") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "ipc:ipc_napi", "napi:ace_napi", + "window_manager:libwm", ] subsystem_name = "ability" @@ -649,6 +648,7 @@ ohos_shared_library("uiabilitykit_native") { "libuv:uv", "napi:ace_napi", "node:node_header_notice", + "window_manager:libwm", ] cflags_cc = [] @@ -679,7 +679,6 @@ ohos_shared_library("uiabilitykit_native") { external_deps += [ "ability_base:session_info", "icu:shared_icuuc", - "window_manager:libwm", "window_manager:libwsutils", "window_manager:windowstage_kit", ] @@ -781,7 +780,6 @@ ohos_shared_library("form_extension") { "access_token:libtokenid_sdk", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", @@ -822,7 +820,6 @@ ohos_shared_library("form_extension_module") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", @@ -879,7 +876,6 @@ ohos_shared_library("service_extension") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -937,7 +933,6 @@ ohos_shared_library("ui_service_extension_connection") { "ability_base:want", "access_token:libtokenid_sdk", "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "ipc:ipc_core", "ipc:ipc_napi", @@ -1421,7 +1416,6 @@ ohos_shared_library("ui_extension") { "access_token:libtokenid_sdk", "c_utils:utils", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -1518,7 +1512,6 @@ ohos_shared_library("share_extension") { "ability_base:want", "c_utils:utils", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_napi", @@ -1570,7 +1563,6 @@ ohos_shared_library("action_extension") { "ability_base:want", "c_utils:utils", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_napi", @@ -1789,7 +1781,6 @@ ohos_shared_library("embedded_ui_extension") { "ability_base:want", "c_utils:utils", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_napi", @@ -1835,7 +1826,6 @@ ohos_shared_library("embedded_ui_extension_module") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "ipc:ipc_core", @@ -1896,7 +1886,6 @@ ohos_shared_library("auto_fill_extension") { "ace_engine:ace_uicontent", "c_utils:utils", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -1999,7 +1988,6 @@ ohos_shared_library("photo_editor_extension") { "app_file_service:fileuri_native", "c_utils:utils", "eventhandler:libeventhandler", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "image_framework:image", diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 8aaad2e862..442997bc8f 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -230,6 +230,9 @@ ohos_shared_library("appkit_native") { defines += [ "NWEB" ] } + + if (ohos_indep_compiler_enable){ memory_utils_purgeable_ashmem_enable = true} + if (memory_utils_purgeable_ashmem_enable && defined(global_parts_info) && defined(global_parts_info.resourceschedule_memmgr_override)) { defines += [ "IMAGE_PURGEABLE_PIXELMAP" ] @@ -313,7 +316,6 @@ ohos_shared_library("app_context") { "ability_base:extractortool", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "init:libbegetutil", @@ -387,7 +389,6 @@ ohos_shared_library("app_context_utils") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", @@ -460,7 +461,6 @@ ohos_shared_library("appkit_delegator") { "bundle_framework:appexecfwk_base", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "image_framework:image_native", @@ -556,7 +556,6 @@ ohos_shared_library("application_context_manager") { } external_deps = [ - "ets_runtime:libark_jsruntime", "hilog:libhilog", "napi:ace_napi", ] diff --git a/frameworks/native/appkit/ability_runtime/context/context_impl.cpp b/frameworks/native/appkit/ability_runtime/context/context_impl.cpp index aa04c2feda..522e09566e 100644 --- a/frameworks/native/appkit/ability_runtime/context/context_impl.cpp +++ b/frameworks/native/appkit/ability_runtime/context/context_impl.cpp @@ -1027,12 +1027,12 @@ void ContextImpl::UpdateResConfig(std::shared_ptrSetDeviceType(GetDeviceType()); std::string mcc = config_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_MCC); std::string mnc = config_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_MNC); - // try { - resConfig->SetMcc(static_cast(std::stoi(mcc))); - resConfig->SetMnc(static_cast(std::stoi(mnc))); - // } catch (...) { - // TAG_LOGD(AAFwkTag::APPKIT, "Set mcc,mnc failed mcc:%{public}s mnc:%{public}s", mcc.c_str(), mnc.c_str()); - // } + try { + resConfig->SetMcc(static_cast(std::stoi(mcc))); + resConfig->SetMnc(static_cast(std::stoi(mnc))); + } catch (...) { + TAG_LOGD(AAFwkTag::APPKIT, "Set mcc,mnc failed mcc:%{public}s mnc:%{public}s", mcc.c_str(), mnc.c_str()); + } resourceManager->UpdateResConfig(*resConfig); } diff --git a/frameworks/native/appkit/app/application_cleaner.cpp b/frameworks/native/appkit/app/application_cleaner.cpp index 4acf00f506..231aa468bd 100644 --- a/frameworks/native/appkit/app/application_cleaner.cpp +++ b/frameworks/native/appkit/app/application_cleaner.cpp @@ -38,7 +38,7 @@ static const std::string CONTEXT_HAPS{ "/haps" }; static const size_t MARK_TEMP_LEN = 12; static const int PATH_MAX_SIZE = 256; -// const mode_t MODE = 0777; +const mode_t MODE = 0777; static const int RESULT_OK = 0; static const int RESULT_ERR = -1; diff --git a/frameworks/native/appkit/app/ohos_application.cpp b/frameworks/native/appkit/app/ohos_application.cpp index ced72ec1be..07692aca34 100644 --- a/frameworks/native/appkit/app/ohos_application.cpp +++ b/frameworks/native/appkit/app/ohos_application.cpp @@ -47,7 +47,7 @@ namespace OHOS { namespace AppExecFwk { namespace { - // constexpr const char* PERSIST_DARKMODE_KEY = "persist.ace.darkmode"; + constexpr const char* PERSIST_DARKMODE_KEY = "persist.ace.darkmode"; } REGISTER_APPLICATION(OHOSApplication, OHOSApplication) constexpr int32_t APP_ENVIRONMENT_OVERWRITE = 1; diff --git a/frameworks/native/appkit/dfr/appfreeze_inner.cpp b/frameworks/native/appkit/dfr/appfreeze_inner.cpp index 19537209b1..b375da3c4c 100644 --- a/frameworks/native/appkit/dfr/appfreeze_inner.cpp +++ b/frameworks/native/appkit/dfr/appfreeze_inner.cpp @@ -34,12 +34,12 @@ namespace OHOS { using AbilityRuntime::FreezeUtil; namespace AppExecFwk { namespace { -// constexpr char EVENT_UID[] = "UID"; +constexpr char EVENT_UID[] = "UID"; constexpr char EVENT_PID[] = "PID"; constexpr char EVENT_MESSAGE[] = "MSG"; -// constexpr char EVENT_PACKAGE_NAME[] = "PACKAGE_NAME"; +constexpr char EVENT_PACKAGE_NAME[] = "PACKAGE_NAME"; constexpr char EVENT_PROCESS_NAME[] = "PROCESS_NAME"; -// constexpr char EVENT_STACK[] = "STACK"; +constexpr char EVENT_STACK[] = "STACK"; } std::weak_ptr AppfreezeInner::appMainHandler_; std::shared_ptr AppfreezeInner::instance_ = nullptr; diff --git a/frameworks/native/insight_intent/insight_intent_context/BUILD.gn b/frameworks/native/insight_intent/insight_intent_context/BUILD.gn index eed96d7eae..05110ba515 100644 --- a/frameworks/native/insight_intent/insight_intent_context/BUILD.gn +++ b/frameworks/native/insight_intent/insight_intent_context/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("insightintentcontext") { external_deps = [ "ability_base:want", "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/frameworks/native/runtime/ohos_js_environment_impl.cpp b/frameworks/native/runtime/ohos_js_environment_impl.cpp index 9ef3d7a5a8..7fa98b370f 100644 --- a/frameworks/native/runtime/ohos_js_environment_impl.cpp +++ b/frameworks/native/runtime/ohos_js_environment_impl.cpp @@ -15,8 +15,8 @@ #include "ohos_js_environment_impl.h" -#include "commonlibrary/ets_utils/js_sys_module/console/console.h" -#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h" +#include "console.h" +#include "timer.h" #include "hilog_tag_wrapper.h" #include "js_utils.h" #include "js_worker.h" @@ -113,7 +113,7 @@ void OHOSJsEnvironmentImpl::InitTimerModule(NativeEngine* engine) { TAG_LOGD(AAFwkTag::JSRUNTIME, "called"); CHECK_POINTER(engine); - auto ret = JsSysModule::Timer::RegisterTime(reinterpret_cast(engine)); + auto ret = OHOS::JsSysModule::Timer::RegisterTime(reinterpret_cast(engine)); if (!ret) { TAG_LOGE(AAFwkTag::JSRUNTIME, "Register timer failed"); } diff --git a/frameworks/simulator/BUILD.gn b/frameworks/simulator/BUILD.gn index fe4510fae1..e886ff604b 100644 --- a/frameworks/simulator/BUILD.gn +++ b/frameworks/simulator/BUILD.gn @@ -169,13 +169,13 @@ ohos_copy("copy_ability_simulator") { sources += [ out_path + "/thirdparty/bounds_checking_function/libsec_shared" + dylib_suffix ] - deps += [ "${ets_utils_path}/js_sys_module/timer:timer" ] - out_path = get_label_info("${ets_utils_path}/js_sys_module/timer:timer", + deps += [ "ets_utils:timer" ] + out_path = get_label_info("ets_utils:timer", "root_out_dir") sources += [ out_path + "/commonlibrary/ets_utils/libtimer" + dylib_suffix ] - deps += [ "${ets_utils_path}/js_sys_module/console:console" ] - out_path = get_label_info("${ets_utils_path}/js_sys_module/console:console", + deps += [ "ets_utils:console" ] + out_path = get_label_info("ets_utils:console", "root_out_dir") sources += [ out_path + "/commonlibrary/ets_utils/libconsole" + dylib_suffix ] diff --git a/frameworks/simulator/ability_simulator/BUILD.gn b/frameworks/simulator/ability_simulator/BUILD.gn index 6526957a6a..e119683798 100644 --- a/frameworks/simulator/ability_simulator/BUILD.gn +++ b/frameworks/simulator/ability_simulator/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//foundation/ability/ability_runtime/ability_runtime.gni") -import("//foundation/arkui/ace_engine/build/ace_gen_obj.gni") +import("//build/config/components/ace_engine/ace_gen_obj.gni") es2abc_gen_abc("gen_abc_js_mock") { js_mock_path = diff --git a/frameworks/simulator/ability_simulator/src/simulator.cpp b/frameworks/simulator/ability_simulator/src/simulator.cpp index 16830fee30..8b23f04031 100644 --- a/frameworks/simulator/ability_simulator/src/simulator.cpp +++ b/frameworks/simulator/ability_simulator/src/simulator.cpp @@ -25,8 +25,8 @@ #include "ability_context.h" #include "ability_stage_context.h" #include "bundle_container.h" -#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h" -#include "commonlibrary/ets_utils/js_sys_module/console/console.h" +#include "timer.h" +#include "console.h" #include "hilog_tag_wrapper.h" #include "js_ability_context.h" #include "js_ability_stage_context.h" diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn index 46e34cf5a1..17004e8e3a 100644 --- a/interfaces/inner_api/ability_manager/BUILD.gn +++ b/interfaces/inner_api/ability_manager/BUILD.gn @@ -135,7 +135,6 @@ ohos_shared_library("ability_manager") { "bundle_framework:libappexecfwk_common", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "hisysevent:libhisysevent", @@ -271,7 +270,6 @@ ohos_shared_library("ability_manager_c") { external_deps = [ "ability_base:session_info", "c_utils:utils", - "ets_runtime:libark_jsruntime", "image_framework:image_native", "ipc:ipc_core", "ipc:ipc_napi", diff --git a/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp index 7265cd8fd7..de947b7dbd 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp @@ -60,21 +60,21 @@ bool AmsMgrProxy::WriteInterfaceToken(MessageParcel &data) return true; } namespace { -// bool WriteTokenObject(MessageParcel &data, sptr token) -// { -// if (token) { -// if (!data.WriteBool(true) || !data.WriteRemoteObject(token)) { -// TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag or token"); -// return false; -// } -// } else { -// if (!data.WriteBool(false)) { -// TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag"); -// return false; -// } -// } -// return true; -// } +bool WriteTokenObject(MessageParcel &data, sptr token) +{ + if (token) { + if (!data.WriteBool(true) || !data.WriteRemoteObject(token)) { + TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag or token"); + return false; + } + } else { + if (!data.WriteBool(false)) { + TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag"); + return false; + } + } + return true; +} } void AmsMgrProxy::LoadAbility(const std::shared_ptr &abilityInfo, diff --git a/interfaces/inner_api/child_process_manager/BUILD.gn b/interfaces/inner_api/child_process_manager/BUILD.gn index e7ba9e81d0..e2d990cfae 100644 --- a/interfaces/inner_api/child_process_manager/BUILD.gn +++ b/interfaces/inner_api/child_process_manager/BUILD.gn @@ -52,7 +52,6 @@ ohos_shared_library("child_process_manager") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "c_utils:utils", - "ets_runtime:libark_jsruntime", "eventhandler:libeventhandler", "hilog:libhilog", "init:libbegetutil", diff --git a/interfaces/inner_api/error_utils/BUILD.gn b/interfaces/inner_api/error_utils/BUILD.gn index f7a27268e3..b4db235008 100644 --- a/interfaces/inner_api/error_utils/BUILD.gn +++ b/interfaces/inner_api/error_utils/BUILD.gn @@ -38,7 +38,6 @@ ohos_shared_library("ability_runtime_error_util") { external_deps = [ "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "napi:ace_napi", ] diff --git a/interfaces/inner_api/quick_fix/BUILD.gn b/interfaces/inner_api/quick_fix/BUILD.gn index ff61927c3a..d232afc824 100644 --- a/interfaces/inner_api/quick_fix/BUILD.gn +++ b/interfaces/inner_api/quick_fix/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import("//foundation/ability/ability_runtime/ability_runtime.gni") -import("//foundation/ability/idl_tool/idl_config.gni") +import("//build/config/components/idl_tool/idl.gni") idl_interface_sources = [ "${target_gen_dir}/quick_fix_manager_proxy.cpp", diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index c37dfe0f54..c109def2ce 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -103,6 +103,7 @@ ohos_shared_library("runtime") { "c_utils:utils", "config_policy:configpolicy_util", "ets_runtime:libark_jsruntime", + "ets_utils:console", "ets_utils:timer", "eventhandler:libeventhandler", "ffrt:libffrt", diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index ca23381f44..2f48232987 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -72,7 +72,6 @@ ohos_shared_library("wantagent_innerkits") { external_deps = [ "ability_base:want", "c_utils:utils", - "ets_runtime:libark_jsruntime", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/interfaces/kits/native/ability/ability_runtime/authorization_result.h b/interfaces/kits/native/ability/ability_runtime/authorization_result.h index aa28854a15..fdc54a2e2c 100755 --- a/interfaces/kits/native/ability/ability_runtime/authorization_result.h +++ b/interfaces/kits/native/ability/ability_runtime/authorization_result.h @@ -17,7 +17,7 @@ #define OHOS_ABILITY_RUNTIME_AUTHORIZATION_RESULT_H #include "ability_context.h" -#include "base/security/access_token/interfaces/innerkits/token_callback/include/token_callback_stub.h" +#include "token_callback_stub.h" namespace OHOS { namespace AbilityRuntime { diff --git a/js_environment/frameworks/js_environment/src/js_environment.cpp b/js_environment/frameworks/js_environment/src/js_environment.cpp index 015185b92f..9fb0ee9228 100644 --- a/js_environment/frameworks/js_environment/src/js_environment.cpp +++ b/js_environment/frameworks/js_environment/src/js_environment.cpp @@ -20,7 +20,7 @@ #include "js_environment_impl.h" #include "native_engine/impl/ark/ark_native_engine.h" #include "uncaught_exception_callback.h" -#include "commonlibrary/ets_utils/js_sys_module/console/console.h" +#include "console.h" namespace OHOS { namespace JsEnv { diff --git a/services/abilitymgr/include/dlp_utils.h b/services/abilitymgr/include/dlp_utils.h index 7879ebe7fc..f01cf1204f 100644 --- a/services/abilitymgr/include/dlp_utils.h +++ b/services/abilitymgr/include/dlp_utils.h @@ -109,24 +109,24 @@ using Dlp = Security::DlpPermission::DlpPermissionKit; return true; } -// static bool CheckCallerIsDlpManager(const std::shared_ptr &bundleManager) -// { -// if (!bundleManager) { -// return false; -// } +static bool CheckCallerIsDlpManager(const std::shared_ptr &bundleManager) +{ + if (!bundleManager) { + return false; + } -// std::string bundleName; -// auto callerUid = IPCSkeleton::GetCallingUid(); -// if (IN_PROCESS_CALL(bundleManager->GetNameForUid(callerUid, bundleName)) != ERR_OK) { -// TAG_LOGW(AAFwkTag::ABILITYMGR, "Get Bundle Name failed"); -// return false; -// } -// if (bundleName != "com.ohos.dlpmanager") { -// TAG_LOGW(AAFwkTag::ABILITYMGR, "Wrong Caller"); -// return false; -// } -// return true; -// } + std::string bundleName; + auto callerUid = IPCSkeleton::GetCallingUid(); + if (IN_PROCESS_CALL(bundleManager->GetNameForUid(callerUid, bundleName)) != ERR_OK) { + TAG_LOGW(AAFwkTag::ABILITYMGR, "Get Bundle Name failed"); + return false; + } + if (bundleName != "com.ohos.dlpmanager") { + TAG_LOGW(AAFwkTag::ABILITYMGR, "Wrong Caller"); + return false; + } + return true; +} } // namespace DlpUtils } // namespace AAFwk diff --git a/services/abilitymgr/src/ability_cache_manager.cpp b/services/abilitymgr/src/ability_cache_manager.cpp index 0663f4879e..a65a1d305e 100644 --- a/services/abilitymgr/src/ability_cache_manager.cpp +++ b/services/abilitymgr/src/ability_cache_manager.cpp @@ -41,7 +41,7 @@ void AbilityCacheManager::Init(uint32_t devCapacity, uint32_t procCapacity) void AbilityCacheManager::RemoveAbilityRecInDevList(std::shared_ptr abilityRecord) { auto it = devRecLru_.begin(); - // uint32_t accessTokenId = abilityRecord->GetApplicationInfo().accessTokenId; + uint32_t accessTokenId = abilityRecord->GetApplicationInfo().accessTokenId; while (it != devRecLru_.end()) { if ((*it)->GetRecordId() == abilityRecord->GetRecordId()) { devRecLru_.erase(it); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 1b7202be77..c808c7c61f 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -38,11 +38,11 @@ namespace OHOS { namespace AAFwk { namespace { -// constexpr char EVENT_KEY_UID[] = "UID"; -// constexpr char EVENT_KEY_PID[] = "PID"; -// constexpr char EVENT_KEY_MESSAGE[] = "MSG"; -// constexpr char EVENT_KEY_PACKAGE_NAME[] = "PACKAGE_NAME"; -// constexpr char EVENT_KEY_PROCESS_NAME[] = "PROCESS_NAME"; +constexpr char EVENT_KEY_UID[] = "UID"; +constexpr char EVENT_KEY_PID[] = "PID"; +constexpr char EVENT_KEY_MESSAGE[] = "MSG"; +constexpr char EVENT_KEY_PACKAGE_NAME[] = "PACKAGE_NAME"; +constexpr char EVENT_KEY_PROCESS_NAME[] = "PROCESS_NAME"; const std::string DEBUG_APP = "debugApp"; const std::string FRS_APP_INDEX = "ohos.extra.param.key.frs_index"; const std::string FRS_BUNDLE_NAME = "com.ohos.formrenderservice"; diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index f9ee11d050..15a7d86c61 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -130,18 +130,9 @@ constexpr const char* PREPARE_TERMINATE_ENABLE_PARAMETER = "persist.sys.prepare_ // UIExtension type constexpr const char* UIEXTENSION_TYPE_KEY = "ability.want.params.uiExtensionType"; constexpr const char* UIEXTENSION_TARGET_TYPE_KEY = "ability.want.params.uiExtensionTargetType"; -<<<<<<< HEAD -// constexpr const char* SYSTEM_SHARE = "share"; -// constexpr const char* SYSTEM_SHARE_TYPE = "sysPicker/share"; // Share picker params constexpr char SHARE_PICKER_DIALOG_BUNDLE_NAME_KEY[] = "const.system.sharePicker.bundleName"; constexpr char SHARE_PICKER_DIALOG_ABILITY_NAME_KEY[] = "const.system.sharePicker.abilityName"; -// constexpr char SHARE_PICKER_UIEXTENSION_NAME_KEY[] = "const.system.sharePicker.UIExtensionAbilityName"; -======= -// Share picker params -constexpr char SHARE_PICKER_DIALOG_BUNDLE_NAME_KEY[] = "const.system.sharePicker.bundleName"; -constexpr char SHARE_PICKER_DIALOG_ABILITY_NAME_KEY[] = "const.system.sharePicker.abilityName"; ->>>>>>> upstream/master constexpr char SHARE_PICKER_DIALOG_DEFAULY_BUNDLE_NAME[] = "com.ohos.sharepickerdialog"; constexpr char SHARE_PICKER_DIALOG_DEFAULY_ABILITY_NAME[] = "PickerDialog"; constexpr char TOKEN_KEY[] = "ohos.ability.params.token"; @@ -149,10 +140,10 @@ constexpr char TOKEN_KEY[] = "ohos.ability.params.token"; constexpr char DEVELOPER_MODE_STATE[] = "const.security.developermode.state"; constexpr char PRODUCT_APPBOOT_SETTING_ENABLED[] = "const.product.appboot.setting.enabled"; // Broker params key -// constexpr const char* KEY_VISIBLE_ID = "ohos.anco.param.visible"; +constexpr const char* KEY_VISIBLE_ID = "ohos.anco.param.visible"; constexpr const char* START_ABILITY_TYPE = "ABILITY_INNER_START_WITH_ACCOUNT"; constexpr const char* BUNDLE_NAME_DIALOG = "com.ohos.amsdialog"; -// constexpr const char* STR_PHONE = "phone"; +constexpr const char* STR_PHONE = "phone"; constexpr const char* PARAM_RESV_ANCO_CALLER_UID = "ohos.anco.param.callerUid"; constexpr const char* PARAM_RESV_ANCO_CALLER_BUNDLENAME = "ohos.anco.param.callerBundleName"; // Distributed continued session Id @@ -177,7 +168,7 @@ constexpr const char* FOUNDATION_PROCESS_NAME = "foundation"; constexpr const char* RSS_PROCESS_NAME = "resource_schedule_service"; constexpr const char* IS_PRELOAD_UIEXTENSION_ABILITY = "ability.want.params.is_preload_uiextension_ability"; constexpr const char* UIEXTENSION_MODAL_TYPE = "ability.want.params.modalType"; -// constexpr const char* SUPPORT_CLOSE_ON_BLUR = "supportCloseOnBlur"; +constexpr const char* SUPPORT_CLOSE_ON_BLUR = "supportCloseOnBlur"; constexpr const char* ATOMIC_SERVICE_PREFIX = "com.atomicservice."; constexpr const char* PARAM_SPECIFIED_PROCESS_FLAG = "ohosSpecifiedProcessFlag"; constexpr const char* CALLER_REQUEST_CODE = "ohos.extra.param.key.callerRequestCode"; @@ -230,7 +221,7 @@ constexpr int32_t ACCOUNT_MGR_SERVICE_UID = 3058; constexpr int32_t DMS_UID = 5522; constexpr int32_t BOOTEVENT_COMPLETED_DELAY_TIME = 1000; constexpr int32_t BOOTEVENT_BOOT_ANIMATION_READY_SIZE = 6; -// constexpr const char* BUNDLE_NAME_KEY = "bundleName"; +constexpr const char* BUNDLE_NAME_KEY = "bundleName"; constexpr const char* DM_PKG_NAME = "ohos.distributedhardware.devicemanager"; constexpr const char* ACTION_CHOOSE = "ohos.want.action.select"; constexpr const char* HIGHEST_PRIORITY_ABILITY_ENTITY = "flag.home.intent.from.system"; @@ -4442,11 +4433,11 @@ void AbilityManagerService::NotifyCompleteContinuation(const std::string &device TAG_LOGE(AAFwkTag::ABILITYMGR, "failed get bms"); return; } - // int32_t callerUid = IPCSkeleton::GetCallingUid(); + int32_t callerUid = IPCSkeleton::GetCallingUid(); std::string callerBundleName; // reset ipc identity auto identity = IPCSkeleton::ResetCallingIdentity(); - // bool result = bundleMgr->GetBundleNameForUid(callerUid, callerBundleName); + bool result = bundleMgr->GetBundleNameForUid(callerUid, callerBundleName); // set ipc identity to raw IPCSkeleton::SetCallingIdentity(identity); TAG_LOGI(AAFwkTag::ABILITYMGR, "callerBundleName: %{public}s", callerBundleName.c_str()); @@ -9737,7 +9728,7 @@ bool AbilityManagerService::CheckUIExtensionCallerPidByHostWindowId(const Abilit CHECK_POINTER_AND_RETURN(sceneSessionManager, false); pid_t hostPid = 0; // If host window id is scb, it will return with error. - // auto ret = sceneSessionManager->CheckWindowId(hostWindowId, hostPid); + auto ret = sceneSessionManager->CheckWindowId(hostWindowId, hostPid); TAG_LOGD(AAFwkTag::UI_EXT, "get pid %{public}d by windowId %{public}d", hostPid, hostWindowId); if (hostPid != 0 && callerAbility->GetPid() == hostPid) { return true; diff --git a/services/abilitymgr/src/free_install_manager.cpp b/services/abilitymgr/src/free_install_manager.cpp index bc993c0631..bbd5c0daaf 100644 --- a/services/abilitymgr/src/free_install_manager.cpp +++ b/services/abilitymgr/src/free_install_manager.cpp @@ -261,7 +261,7 @@ void FreeInstallManager::NotifyFreeInstallResult(int32_t recordId, const Want &w return; } - // bool isFromRemote = want.GetBoolParam(FROM_REMOTE_KEY, false); + bool isFromRemote = want.GetBoolParam(FROM_REMOTE_KEY, false); for (auto it = freeInstallList_.begin(); it != freeInstallList_.end();) { FreeInstallInfo &freeInstallInfo = *it; std::string bundleName = freeInstallInfo.want.GetElement().GetBundleName(); diff --git a/services/abilitymgr/src/insight_intent_execute_param.cpp b/services/abilitymgr/src/insight_intent_execute_param.cpp index b94d470071..f325604381 100644 --- a/services/abilitymgr/src/insight_intent_execute_param.cpp +++ b/services/abilitymgr/src/insight_intent_execute_param.cpp @@ -83,12 +83,12 @@ bool InsightIntentExecuteParam::GenerateFromWant(const AAFwk::Want &want, return false; } uint64_t insightIntentId = 0; - // try { - // insightIntentId = std::stoull(wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_ID)); - // } catch (...) { - // TAG_LOGE(AAFwkTag::ABILITY, "invalid insight intent ID"); - // return false; - // } + try { + insightIntentId = std::stoull(wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_ID)); + } catch (...) { + TAG_LOGE(AAFwkTag::ABILITY, "invalid insight intent ID"); + return false; + } AppExecFwk::ElementName elementName = want.GetElement(); executeParam.bundleName_ = elementName.GetBundleName(); diff --git a/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp b/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp index 2c9fe8cb67..703b388661 100644 --- a/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp @@ -28,7 +28,7 @@ constexpr const char* UNREGISTER_EVENT_TASK = "unregister event task"; constexpr const char* UNREGISTER_TIMEOUT_OBSERVER_TASK = "unregister timeout observer task"; constexpr int UNREGISTER_OBSERVER_MICRO_SECONDS = 5000; constexpr const char* UIEXTENSION_MODAL_TYPE = "ability.want.params.modalType"; -// constexpr const char* INTERCEPT_PARAMETERS = "intercept_parammeters"; +constexpr const char* INTERCEPT_PARAMETERS = "intercept_parammeters"; constexpr const char* INTERCEPT_BUNDLE_NAME = "intercept_bundleName"; constexpr const char* INTERCEPT_ABILITY_NAME = "intercept_abilityName"; constexpr const char* INTERCEPT_MODULE_NAME = "intercept_moduleName"; diff --git a/services/abilitymgr/src/mission/mission_list_manager.cpp b/services/abilitymgr/src/mission/mission_list_manager.cpp index ffcced90d9..d06476031c 100644 --- a/services/abilitymgr/src/mission/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission/mission_list_manager.cpp @@ -45,11 +45,11 @@ namespace { constexpr uint32_t DELAY_NOTIFY_LABEL_TIME = 30; // 30ms constexpr uint32_t SCENE_FLAG_KEYGUARD = 1; constexpr uint32_t ONLY_ONE_ABILITY = 1; -// constexpr const char* EVENT_KEY_UID = "UID"; -// constexpr const char* EVENT_KEY_PID = "PID"; -// constexpr const char* EVENT_KEY_MESSAGE = "MSG"; -// constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME"; -// constexpr const char* EVENT_KEY_PROCESS_NAME = "PROCESS_NAME"; +constexpr const char* EVENT_KEY_UID = "UID"; +constexpr const char* EVENT_KEY_PID = "PID"; +constexpr const char* EVENT_KEY_MESSAGE = "MSG"; +constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME"; +constexpr const char* EVENT_KEY_PROCESS_NAME = "PROCESS_NAME"; constexpr int32_t SINGLE_MAX_INSTANCE_COUNT = 128; constexpr int32_t MAX_INSTANCE_COUNT = 512; constexpr uint64_t NANO_SECOND_PER_SEC = 1000000000; // ns diff --git a/services/abilitymgr/src/rdb/ability_resident_process_rdb.cpp b/services/abilitymgr/src/rdb/ability_resident_process_rdb.cpp index eccbbc7ed2..c8f801851e 100644 --- a/services/abilitymgr/src/rdb/ability_resident_process_rdb.cpp +++ b/services/abilitymgr/src/rdb/ability_resident_process_rdb.cpp @@ -60,7 +60,7 @@ int32_t AmsResidentProcessRdbCallBack::OnCreate(NativeRdb::RdbStore &rdbStore) valuesBuckets.emplace_back(valuesBucket); } - // int64_t rowId = -1; + int64_t rowId = -1; int64_t insertNum = 0; int32_t ret = rdbStore.BatchInsert(insertNum, rdbConfig_.tableName, valuesBuckets); if (ret != NativeRdb::E_OK) { diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index c76f9bfb7b..aac3574da6 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -50,7 +50,7 @@ constexpr int KILL_TIMEOUT_MULTIPLE = 45; #else constexpr int KILL_TIMEOUT_MULTIPLE = 3; #endif -// constexpr int32_t DEFAULT_USER_ID = 0; +constexpr int32_t DEFAULT_USER_ID = 0; constexpr int32_t MAX_FIND_UIEXTENSION_CALLER_TIMES = 10; FreezeUtil::TimeoutState MsgId2State(uint32_t msgId) @@ -1991,7 +1991,7 @@ void UIAbilityLifecycleManager::SetRevicerInfo(const AbilityRequest &abilityRequ auto isStandard = abilityInfo.launchMode == AppExecFwk::LaunchMode::STANDARD && !abilityRequest.startRecent; if (isStandard && abilityRequest.sessionInfo != nullptr) { // Support standard launch type. - // auto persistentId = abilityRequest.sessionInfo->persistentId; + auto persistentId = abilityRequest.sessionInfo->persistentId; abilityName += std::to_string(abilityRequest.sessionInfo->persistentId); } diff --git a/services/appmgr/src/ams_mgr_scheduler.cpp b/services/appmgr/src/ams_mgr_scheduler.cpp index 137d6fbd6b..b6d0adea67 100644 --- a/services/appmgr/src/ams_mgr_scheduler.cpp +++ b/services/appmgr/src/ams_mgr_scheduler.cpp @@ -35,13 +35,13 @@ constexpr const char* TASK_TERMINATE_ABILITY = "TerminateAbilityTask"; constexpr const char* TASK_UPDATE_ABILITY_STATE = "UpdateAbilityStateTask"; constexpr const char* TASK_UPDATE_EXTENSION_STATE = "UpdateExtensionStateTask"; constexpr const char* TASK_REGISTER_APP_STATE_CALLBACK = "RegisterAppStateCallbackTask"; -// constexpr const char* TASK_STOP_ALL_PROCESS = "StopAllProcessTask"; -// constexpr const char* TASK_ABILITY_BEHAVIOR_ANALYSIS = "AbilityBehaviorAnalysisTask"; +constexpr const char* TASK_STOP_ALL_PROCESS = "StopAllProcessTask"; +constexpr const char* TASK_ABILITY_BEHAVIOR_ANALYSIS = "AbilityBehaviorAnalysisTask"; constexpr const char* TASK_KILL_PROCESS_BY_ABILITY_TOKEN = "KillProcessByAbilityTokenTask"; constexpr const char* TASK_KILL_PROCESSES_BY_USERID = "KillProcessesByUserIdTask"; constexpr const char* TASK_KILL_PROCESSES_BY_PIDS = "KillProcessesByPids"; constexpr const char* TASK_ATTACH_PID_TO_PARENT = "AttachPidToParent"; -// constexpr const char* TASK_KILL_APPLICATION = "KillApplicationTask"; +constexpr const char* TASK_KILL_APPLICATION = "KillApplicationTask"; constexpr const char* TASK_CLEAR_PROCESS_BY_ABILITY_TOKEN = "ClearProcessByAbilityTokenTask"; constexpr const char* FOUNDATION_NAME = "foundation"; constexpr const char* SCENE_BOARD_BUNDLE_NAME = "com.ohos.sceneboard"; diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp index a6f9dbbd89..51de816797 100644 --- a/services/appmgr/src/app_mgr_service.cpp +++ b/services/appmgr/src/app_mgr_service.cpp @@ -34,7 +34,7 @@ #include "permission_constants.h" #include "permission_verification.h" #include "system_ability_definition.h" -#include "base/security/access_token/interfaces/innerkits/accesstoken/include/accesstoken_kit.h" +#include "accesstoken_kit.h" #include "app_mgr_service_const.h" #include "app_mgr_service_dump_error_code.h" #include "cache_process_manager.h" @@ -60,11 +60,6 @@ constexpr const char* TASK_APPLICATION_FOREGROUNDED = "ApplicationForegroundedTa constexpr const char* TASK_APPLICATION_BACKGROUNDED = "ApplicationBackgroundedTask"; constexpr const char* TASK_APPLICATION_TERMINATED = "ApplicationTerminatedTask"; constexpr const char* TASK_ABILITY_CLEANED = "AbilityCleanedTask"; -<<<<<<< HEAD -// constexpr const char* TASK_ADD_APP_DEATH_RECIPIENT = "AddAppRecipientTask"; -// constexpr const char* TASK_CLEAR_UP_APPLICATION_DATA = "ClearUpApplicationDataTask"; -======= ->>>>>>> upstream/master constexpr const char* TASK_STARTUP_RESIDENT_PROCESS = "StartupResidentProcess"; constexpr const char* TASK_ADD_ABILITY_STAGE_DONE = "AddAbilityStageDone"; constexpr const char* TASK_START_USER_TEST_PROCESS = "StartUserTestProcess"; diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index 4d2bd072b4..9058f422f0 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -144,7 +144,7 @@ constexpr int KILL_PROCESS_TIMEOUT_MICRO_SECONDS = 1000; constexpr int KILL_PROCESS_DELAYTIME_MICRO_SECONDS = 200; // delay register focus listener to wms constexpr int REGISTER_FOCUS_DELAY = 5000; -// constexpr int REGISTER_VISIBILITY_DELAY = 5000; +constexpr int REGISTER_VISIBILITY_DELAY = 5000; constexpr int REGISTER_PID_VISIBILITY_DELAY = 5000; // Max render process number limitation for phone device. constexpr int PHONE_MAX_RENDER_PROCESS_NUM = 40; @@ -152,8 +152,8 @@ constexpr int PROCESS_RESTART_MARGIN_MICRO_SECONDS = 2000; constexpr const int32_t API10 = 10; constexpr const int32_t API_VERSION_MOD = 100; constexpr const int32_t U0_USER_ID = 0; -// constexpr const char* CLASS_NAME = "ohos.app.MainThread"; -// constexpr const char* FUNC_NAME = "main"; +constexpr const char* CLASS_NAME = "ohos.app.MainThread"; +constexpr const char* FUNC_NAME = "main"; constexpr const char* RENDER_PARAM = "invalidparam"; constexpr const char* COLD_START = "coldStart"; constexpr const char* PERF_CMD = "perfCmd"; @@ -208,9 +208,9 @@ constexpr ErrCode APPMGR_ERR_OFFSET = ErrCodeOffset(SUBSYS_APPEXECFWK, 0x01); constexpr ErrCode ERR_ALREADY_EXIST_RENDER = APPMGR_ERR_OFFSET + 100; // Error code for reaching render process number limitation. constexpr ErrCode ERR_REACHING_MAXIMUM_RENDER_PROCESS_LIMITATION = APPMGR_ERR_OFFSET + 101; -// constexpr const char* EVENT_KEY_UID = "UID"; +constexpr const char* EVENT_KEY_UID = "UID"; constexpr const char* EVENT_KEY_PID = "PID"; -// constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME"; +constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME"; constexpr const char* EVENT_KEY_PROCESS_NAME = "PROCESS_NAME"; constexpr const char* EVENT_KEY_MESSAGE = "MSG"; @@ -232,7 +232,7 @@ constexpr const char* SUPPORT_CALL_NOTIFY_MEMORY_CHANGED = constexpr const char* SYSTEM_BASIC = "system_basic"; constexpr const char* SYSTEM_CORE = "system_core"; -// constexpr const char* ABILITY_OWNER_USERID = "AbilityMS_Owner_UserId"; +constexpr const char* ABILITY_OWNER_USERID = "AbilityMS_Owner_UserId"; constexpr const char* PROCESS_EXIT_EVENT_TASK = "Send Process Exit Event Task"; constexpr const char* KILL_PROCESS_REASON_PREFIX = "Kill Reason:"; constexpr const char* PRELOAD_APPLIATION_TASK = "PreloadApplicactionTask"; @@ -7925,7 +7925,7 @@ bool AppMgrServiceInner::IsKilledForUpgradeWeb(const std::string &bundleName) co void AppMgrServiceInner::GetPidsByAccessTokenId(const uint32_t accessTokenId, std::vector &pids) { - // int32_t result = ERR_OK; + int32_t result = ERR_OK; pid_t foregroundPid = -1; for (const auto &item : appRunningManager_->GetAppRunningRecordMap()) { const auto &appRecord = item.second; diff --git a/services/appmgr/src/app_spawn_client.cpp b/services/appmgr/src/app_spawn_client.cpp index 5882e7cae9..66bf3544f6 100644 --- a/services/appmgr/src/app_spawn_client.cpp +++ b/services/appmgr/src/app_spawn_client.cpp @@ -148,14 +148,14 @@ static std::string DumpAppEnvToJson(const std::map &ap return appEnvJson.dump(); } -// static std::string DumpExtensionSandboxDirsToJson(const std::map &extensionSandboxDirs) -// { -// nlohmann::json extensionSandboxDirsJson; -// for (auto &[userId, sandboxDir] : extensionSandboxDirs) { -// extensionSandboxDirsJson[userId] = sandboxDir; -// } -// return extensionSandboxDirsJson.dump(); -// } +static std::string DumpExtensionSandboxDirsToJson(const std::map &extensionSandboxDirs) +{ + nlohmann::json extensionSandboxDirsJson; + for (auto &[userId, sandboxDir] : extensionSandboxDirs) { + extensionSandboxDirsJson[userId] = sandboxDir; + } + return extensionSandboxDirsJson.dump(); +} int32_t AppSpawnClient::SetDacInfo(const AppSpawnStartMsg &startMsg, AppSpawnReqMsgHandle reqHandle) { diff --git a/services/appmgr/src/exit_resident_process_manager.cpp b/services/appmgr/src/exit_resident_process_manager.cpp index fe24afb8c9..b340b8d6fe 100644 --- a/services/appmgr/src/exit_resident_process_manager.cpp +++ b/services/appmgr/src/exit_resident_process_manager.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace AppExecFwk { namespace { -// constexpr int32_t U0_USER_ID = 0; +constexpr int32_t U0_USER_ID = 0; constexpr int32_t BASE_USER_RANGE = 200000; } ExitResidentProcessManager::~ExitResidentProcessManager() {} diff --git a/tools/aa/src/ability_command.cpp b/tools/aa/src/ability_command.cpp index 9dd380937b..dd44b8d80b 100644 --- a/tools/aa/src/ability_command.cpp +++ b/tools/aa/src/ability_command.cpp @@ -606,11 +606,11 @@ Reason AbilityManagerShellCommand::CovertExitReason(std::string& reasonStr) pid_t AbilityManagerShellCommand::ConvertPid(std::string& inputPid) { pid_t pid = 0; - // try { - pid = static_cast(std::stoi(inputPid)); - // } catch (...) { - // TAG_LOGW(AAFwkTag::AA_TOOL, "pid stoi(%{public}s) failed", inputPid.c_str()); - // } + try { + pid = static_cast(std::stoi(inputPid)); + } catch (...) { + TAG_LOGW(AAFwkTag::AA_TOOL, "pid stoi(%{public}s) failed", inputPid.c_str()); + } return pid; } From d5bb21a4774441ea48bae5bf8bb81aa3b266faac Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Tue, 15 Oct 2024 19:29:38 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhubingwei --- frameworks/js/napi/featureAbility/BUILD.gn | 3 +-- frameworks/js/napi/particleAbility/BUILD.gn | 1 - frameworks/native/appkit/BUILD.gn | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frameworks/js/napi/featureAbility/BUILD.gn b/frameworks/js/napi/featureAbility/BUILD.gn index 203dd4df35..def1c5460f 100644 --- a/frameworks/js/napi/featureAbility/BUILD.gn +++ b/frameworks/js/napi/featureAbility/BUILD.gn @@ -68,8 +68,7 @@ ohos_shared_library("featureability") { if (ability_runtime_relational) { include_dirs += [ "data_ability/include" ] - sources += [ - "data_ability/js_df_manager.cpp", + sources += [ "data_ability/js_utils.cpp", "data_ability/napi_data_ability_predicates.cpp", "data_ability/napi_rdb_js_utils.cpp", diff --git a/frameworks/js/napi/particleAbility/BUILD.gn b/frameworks/js/napi/particleAbility/BUILD.gn index ddb20b632d..ff36e4f04a 100644 --- a/frameworks/js/napi/particleAbility/BUILD.gn +++ b/frameworks/js/napi/particleAbility/BUILD.gn @@ -64,7 +64,6 @@ ohos_shared_library("particleability") { if (ability_runtime_relational) { include_dirs += [ "../featureAbility/data_ability/include" ] sources += [ - "../featureAbility/data_ability/js_df_manager.cpp", "../featureAbility/data_ability/js_utils.cpp", "../featureAbility/data_ability/napi_data_ability_predicates.cpp", "../featureAbility/data_ability/napi_rdb_js_utils.cpp", diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 442997bc8f..9e23e5c79f 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -196,6 +196,7 @@ ohos_shared_library("appkit_native") { "init:libbegetutil", "ipc:ipc_core", "ipc:ipc_napi", + "ipc:ipc_single", "json:nlohmann_json_static", "napi:ace_napi", "preferences:native_preferences", From 393cc17c872f8be5e5eb29333a182ab09560f6e8 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Wed, 16 Oct 2024 09:51:15 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=20=20=20=E6=89=80=E9=9C=80ets=5Futils=20?= =?UTF-8?q?=E5=BA=93=20=E4=BE=9D=E8=B5=96=E6=B7=BB=E5=8A=A0=20Signed-off-b?= =?UTF-8?q?y:=20zhubingwei=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/inner_api/runtime/BUILD.gn | 1 + js_environment/frameworks/js_environment/BUILD.gn | 1 + 2 files changed, 2 insertions(+) diff --git a/interfaces/inner_api/runtime/BUILD.gn b/interfaces/inner_api/runtime/BUILD.gn index c109def2ce..9c19a5163a 100644 --- a/interfaces/inner_api/runtime/BUILD.gn +++ b/interfaces/inner_api/runtime/BUILD.gn @@ -104,6 +104,7 @@ ohos_shared_library("runtime") { "config_policy:configpolicy_util", "ets_runtime:libark_jsruntime", "ets_utils:console", + "ets_utils:worker", "ets_utils:timer", "eventhandler:libeventhandler", "ffrt:libffrt", diff --git a/js_environment/frameworks/js_environment/BUILD.gn b/js_environment/frameworks/js_environment/BUILD.gn index 684f735af7..0e23c93a84 100644 --- a/js_environment/frameworks/js_environment/BUILD.gn +++ b/js_environment/frameworks/js_environment/BUILD.gn @@ -45,6 +45,7 @@ ohos_shared_library("js_environment") { "c_utils:utils", "ets_runtime:libark_jsruntime", "ets_utils:console", + "ets_utils:worker", "eventhandler:libeventhandler", "faultloggerd:libunwinder", "ffrt:libffrt", From 5a5e02017779511af58eceba8bc338f72e1a1f62 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Wed, 16 Oct 2024 12:28:56 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhubingwei --- frameworks/native/ability/native/BUILD.gn | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 597116890c..603c5586e8 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -646,11 +646,6 @@ ohos_shared_library("uiabilitykit_native") { "bundle_framework:appexecfwk_core", "libuv:uv", "napi:ace_napi", -<<<<<<< HEAD - "node:node_header_notice", - "window_manager:libwm", -======= ->>>>>>> master ] cflags_cc = [] From d910f8f6cb36af2cb42f5e3a6c3163c9e6a06756 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Wed, 16 Oct 2024 18:36:17 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20frameworks\native\ap?= =?UTF-8?q?pkit\BUILD.gn=20=20=E4=B8=AD=20memory=5Futils=5Fpurgeable=5Fash?= =?UTF-8?q?mem=5Fenable=20Signed-off-by:=20zhubingwei=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/native/appkit/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index 9e23e5c79f..09270af11d 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -232,7 +232,7 @@ ohos_shared_library("appkit_native") { } - if (ohos_indep_compiler_enable){ memory_utils_purgeable_ashmem_enable = true} + memory_utils_purgeable_ashmem_enable = true if (memory_utils_purgeable_ashmem_enable && defined(global_parts_info) && defined(global_parts_info.resourceschedule_memmgr_override)) { From 92d17f5689c72cf1615f81d96583ae76b78478bc Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Thu, 17 Oct 2024 09:55:49 +0800 Subject: [PATCH 07/11] node:node_header_notice Signed-off-by: zhubingwei --- frameworks/native/ability/native/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn index 603c5586e8..9efc0d510f 100644 --- a/frameworks/native/ability/native/BUILD.gn +++ b/frameworks/native/ability/native/BUILD.gn @@ -346,6 +346,7 @@ ohos_shared_library("abilitykit_native") { "ipc:rpc", "json:nlohmann_json_static", "napi:ace_napi", + "node:node_header_notice", "resource_management:global_resmgr", "samgr:samgr_proxy", "window_manager:windowstage_kit", @@ -646,6 +647,8 @@ ohos_shared_library("uiabilitykit_native") { "bundle_framework:appexecfwk_core", "libuv:uv", "napi:ace_napi", + "node:node_header_notice", + "window_manager:libwm", ] cflags_cc = [] From 3f05874f05139c2fb5d916e16d4685bcfb9cee27 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Thu, 17 Oct 2024 14:31:34 +0800 Subject: [PATCH 08/11] =?UTF-8?q?napi=5Fcommon=20=20=20=E5=8E=BB=E6=8E=89l?= =?UTF-8?q?ibwm=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhubingwei --- frameworks/js/napi/inner/napi_common/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/js/napi/inner/napi_common/BUILD.gn b/frameworks/js/napi/inner/napi_common/BUILD.gn index 3b74ebf284..c7798eda9c 100644 --- a/frameworks/js/napi/inner/napi_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_common/BUILD.gn @@ -62,8 +62,7 @@ ohos_shared_library("napi_common") { "ipc:ipc_napi", "json:nlohmann_json_static", "libuv:uv", - "napi:ace_napi", - "window_manager:libwm", + "napi:ace_napi", ] public_external_deps = [ From 4695037c4fd032af5d2f7f67aa927adb1653ae6c Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Thu, 17 Oct 2024 15:08:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?frameworks\simulator\ability=5Fsimulator\?= =?UTF-8?q?BUILD.gn=20=20=E5=9B=9E=E9=80=80=20=20ace=5Fgen=5Fobj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhubingwei --- frameworks/simulator/ability_simulator/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/simulator/ability_simulator/BUILD.gn b/frameworks/simulator/ability_simulator/BUILD.gn index e119683798..6526957a6a 100644 --- a/frameworks/simulator/ability_simulator/BUILD.gn +++ b/frameworks/simulator/ability_simulator/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/components/ets_frontend/es2abc_config.gni") import("//build/ohos.gni") import("//foundation/ability/ability_runtime/ability_runtime.gni") -import("//build/config/components/ace_engine/ace_gen_obj.gni") +import("//foundation/arkui/ace_engine/build/ace_gen_obj.gni") es2abc_gen_abc("gen_abc_js_mock") { js_mock_path = From 2925255d7fcd9a14b1ede15757908f2f9cb535eb Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Thu, 17 Oct 2024 15:38:30 +0800 Subject: [PATCH 10/11] =?UTF-8?q?node=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhubingwei --- bundle.json | 1 + frameworks/js/napi/mission_manager/BUILD.gn | 1 + frameworks/js/napi/particleAbility/BUILD.gn | 1 + frameworks/js/napi/wantagent/BUILD.gn | 1 + frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn | 1 + 5 files changed, 5 insertions(+) diff --git a/bundle.json b/bundle.json index a154fac39c..7e4682754a 100644 --- a/bundle.json +++ b/bundle.json @@ -83,6 +83,7 @@ "memory_utils", "napi", "netmanager_base", + "node", "os_account", "power_manager", "preferences", diff --git a/frameworks/js/napi/mission_manager/BUILD.gn b/frameworks/js/napi/mission_manager/BUILD.gn index 1f7aead2d0..4809eefeea 100644 --- a/frameworks/js/napi/mission_manager/BUILD.gn +++ b/frameworks/js/napi/mission_manager/BUILD.gn @@ -109,6 +109,7 @@ ohos_shared_library("distributedmissionmanager") { "ipc:ipc_napi", "libuv:uv", "napi:ace_napi", + "node:node_header_notice", "samgr:samgr_proxy", ] diff --git a/frameworks/js/napi/particleAbility/BUILD.gn b/frameworks/js/napi/particleAbility/BUILD.gn index cf955abc09..ff36e4f04a 100644 --- a/frameworks/js/napi/particleAbility/BUILD.gn +++ b/frameworks/js/napi/particleAbility/BUILD.gn @@ -58,6 +58,7 @@ ohos_shared_library("particleability") { "jsoncpp:jsoncpp", "libuv:uv", "napi:ace_napi", + "node:node_header_notice", ] if (ability_runtime_relational) { diff --git a/frameworks/js/napi/wantagent/BUILD.gn b/frameworks/js/napi/wantagent/BUILD.gn index ad575180ca..543f70cb9f 100644 --- a/frameworks/js/napi/wantagent/BUILD.gn +++ b/frameworks/js/napi/wantagent/BUILD.gn @@ -47,6 +47,7 @@ ohos_shared_library("wantagent") { "ipc:ipc_core", "libuv:uv", "napi:ace_napi", + "node:node_header_notice", ] cflags_cc = [] diff --git a/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn b/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn index ec8c8f80d9..bdde0232e8 100644 --- a/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn +++ b/frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn @@ -47,6 +47,7 @@ ohos_shared_library("wantagent_napi") { "ipc:ipc_core", "libuv:uv", "napi:ace_napi", + "node:node_header_notice", ] relative_install_dir = "module/app/ability" From d2ce3ccb51a1974e45673f2bba1d8d251d391e92 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Thu, 17 Oct 2024 15:58:11 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=9B=9E=E9=80=80=20=20frameworks/simula?= =?UTF-8?q?tor/BUILD.gn=20=20=20ets=5Futils=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhubingwei --- frameworks/simulator/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/simulator/BUILD.gn b/frameworks/simulator/BUILD.gn index e886ff604b..fe4510fae1 100644 --- a/frameworks/simulator/BUILD.gn +++ b/frameworks/simulator/BUILD.gn @@ -169,13 +169,13 @@ ohos_copy("copy_ability_simulator") { sources += [ out_path + "/thirdparty/bounds_checking_function/libsec_shared" + dylib_suffix ] - deps += [ "ets_utils:timer" ] - out_path = get_label_info("ets_utils:timer", + deps += [ "${ets_utils_path}/js_sys_module/timer:timer" ] + out_path = get_label_info("${ets_utils_path}/js_sys_module/timer:timer", "root_out_dir") sources += [ out_path + "/commonlibrary/ets_utils/libtimer" + dylib_suffix ] - deps += [ "ets_utils:console" ] - out_path = get_label_info("ets_utils:console", + deps += [ "${ets_utils_path}/js_sys_module/console:console" ] + out_path = get_label_info("${ets_utils_path}/js_sys_module/console:console", "root_out_dir") sources += [ out_path + "/commonlibrary/ets_utils/libconsole" + dylib_suffix ]