From fbec51765329992924fcf5d6ac6df6044cf90a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Tue, 2 Sep 2025 21:05:31 +0800 Subject: [PATCH 01/12] =?UTF-8?q?ExecuteModuleBuffer=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../engine/jsi/jsi_declarative_engine.cpp | 22 +++++++++++++------ .../js_frontend/engine/jsi/ark_js_runtime.cpp | 10 +++++++++ .../js_frontend/engine/jsi/ark_js_runtime.h | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index 361e88abe4f..ee79b97a77c 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -23,6 +23,7 @@ #include #include "dfx_jsnapi.h" +#include "extractor.h" #if !defined(PREVIEW) && !defined(ANDROID_PLATFORM) && !defined(IOS_PLATFORM) #include "console.h" @@ -1694,9 +1695,6 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c } return true; } - if (!delegate->GetAssetContent(FORM_ES_MODULE_CARD_PATH, content)) { - return false; - } const std::string bundleName = frontEnd->GetBundleName(); std::string moduleName = frontEnd->GetModuleName(); #ifdef PREVIEW @@ -1718,12 +1716,22 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c abcPath = moduleName.append("/").append(fileName); #endif { - if (arkRuntime->IsStaticOrInvalidFile(content.data(), content.size())) { + bool flag = false; + const std::string hapFilePath = container->GetHapPath(); + std::shared_ptr extractor = AbilityBase::ExtractorUtil::GetExtractor(hapFilePath, flag, false); + if (extractor == nullptr) { + TAG_LOGE(AceLogTag::ACE_ROUTER, "hapFilePath %{private}s GetExtractor failed", hapFilePath.c_str()); return false; } - } - { - if (!arkRuntime->ExecuteModuleBuffer(content.data(), content.size(), abcPath, true)) { + auto data = extractor->GetSafeData(FORM_ES_MODULE_CARD_PATH); + if (!data) { + TAG_LOGE(AceLogTag::ACE_ROUTER, "null data"); + return false; + } + if (arkRuntime->IsStaticOrInvalidFile(data->GetDataPtr(), data->GetDataLen())) { + return false; + } + if (!arkRuntime->ExecuteModuleBufferSecure(data->GetDataPtr(), data->GetDataLen() abcPath, true)) { return false; } } diff --git a/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.cpp b/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.cpp index cb44cd7c411..2bd3061899c 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.cpp +++ b/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.cpp @@ -245,6 +245,16 @@ bool ArkJSRuntime::ExecuteModuleBuffer(const uint8_t* data, int32_t size, const return ret; } +bool ArkJSRuntime::ExecuteModuleBufferSecure(uint8_t* data, int32_t size, const std::string& filename, bool needUpdate) +{ + JSExecutionScope executionScope(vm_); + LocalScope scope(vm_); + panda::TryCatch trycatch(vm_); + bool ret = JSNApi::ExecuteModuleBufferSecure(vm_, data, size, filename, needUpdate); + HandleUncaughtException(trycatch); + return ret; +} + shared_ptr ArkJSRuntime::EvaluateJsCode([[maybe_unused]] const std::string& src) { return NewUndefined(); diff --git a/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.h b/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.h index 67dc759861a..a9256718128 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.h +++ b/frameworks/bridge/js_frontend/engine/jsi/ark_js_runtime.h @@ -107,6 +107,7 @@ public: const std::string &bundleName, const std::string &moduleName, const std::string &ohmurl); bool IsStaticOrInvalidFile(const uint8_t *data, int32_t size); bool ExecuteModuleBuffer(const uint8_t *data, int32_t size, const std::string &filename, bool needUpdate = false); + bool ExecuteModuleBufferSecure(uint8_t *data, int32_t size, const std::string &filename, bool needUpdate = false); int32_t LoadDestinationFile(const std::string& bundleName, const std::string& moduleName, const std::string& pageSourceFile, bool isSingleton); -- Gitee From 2d8778ba461627946be4480ce0a84bdd973fff2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Tue, 2 Sep 2025 13:36:00 +0000 Subject: [PATCH 02/12] =?UTF-8?q?ExecuteModuleBuffer=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../declarative_frontend/engine/jsi/jsi_declarative_engine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index ee79b97a77c..dea3709b72d 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -1718,7 +1718,8 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c { bool flag = false; const std::string hapFilePath = container->GetHapPath(); - std::shared_ptr extractor = AbilityBase::ExtractorUtil::GetExtractor(hapFilePath, flag, false); + std::shared_ptr extractor = + AbilityBase::ExtractorUtil::GetExtractor(hapFilePath, flag, false); if (extractor == nullptr) { TAG_LOGE(AceLogTag::ACE_ROUTER, "hapFilePath %{private}s GetExtractor failed", hapFilePath.c_str()); return false; -- Gitee From 2ce84755827442ee5a531c96e04f8217ac914177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Wed, 3 Sep 2025 02:52:46 +0000 Subject: [PATCH 03/12] =?UTF-8?q?ExecuteModuleBuffer=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../declarative_frontend/engine/jsi/jsi_declarative_engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index dea3709b72d..c1cb165c2be 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -1718,7 +1718,7 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c { bool flag = false; const std::string hapFilePath = container->GetHapPath(); - std::shared_ptr extractor = + std::shared_ptr extractor = AbilityBase::ExtractorUtil::GetExtractor(hapFilePath, flag, false); if (extractor == nullptr) { TAG_LOGE(AceLogTag::ACE_ROUTER, "hapFilePath %{private}s GetExtractor failed", hapFilePath.c_str()); -- Gitee From 87c86f60656096c6f8d175c04f17963397427dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Wed, 3 Sep 2025 07:19:54 +0000 Subject: [PATCH 04/12] update frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 92d296228ee..4cf76090568 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -379,6 +379,7 @@ template("declarative_js_engine_ark") { if (is_ohos_standard_system) { external_deps += [ "ability_base:want", + "ability_base:extractortool", "ability_runtime:app_manager", "bundle_framework:appexecfwk_core", "form_fwk:fmskit_native", -- Gitee From d9b68058bd84d5ef35aaae29d015e1cf0268e0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Wed, 3 Sep 2025 08:05:35 +0000 Subject: [PATCH 05/12] update frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../declarative_frontend/engine/jsi/jsi_declarative_engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index c1cb165c2be..1c1fc7aa328 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -1732,7 +1732,7 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c if (arkRuntime->IsStaticOrInvalidFile(data->GetDataPtr(), data->GetDataLen())) { return false; } - if (!arkRuntime->ExecuteModuleBufferSecure(data->GetDataPtr(), data->GetDataLen() abcPath, true)) { + if (!arkRuntime->ExecuteModuleBufferSecure(data->GetDataPtr(), data->GetDataLen(), abcPath, true)) { return false; } } -- Gitee From 9493a8c5e4aa5f7ad967c6af2b528b0522d30bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Thu, 4 Sep 2025 02:56:50 +0000 Subject: [PATCH 06/12] =?UTF-8?q?ExecuteModuleBuffer=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 4cf76090568..0b73ddb4c25 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -339,7 +339,10 @@ template("declarative_js_engine_ark") { if (is_arkui_x) { deps += [ "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl" ] } - external_deps = [ "graphic_2d:drawing_napi_impl" ] + external_deps = [ + "ability_base:extractortool", + "graphic_2d:drawing_napi_impl", + ] if (!build_ohos_sdk && !is_arkui_x) { external_deps += [ "ets_utils:console", @@ -379,7 +382,6 @@ template("declarative_js_engine_ark") { if (is_ohos_standard_system) { external_deps += [ "ability_base:want", - "ability_base:extractortool", "ability_runtime:app_manager", "bundle_framework:appexecfwk_core", "form_fwk:fmskit_native", -- Gitee From 88ff44550ecf5596f180cdc2be63eaadadcd966f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Thu, 11 Sep 2025 08:37:45 +0000 Subject: [PATCH 07/12] update frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 0b73ddb4c25..92d296228ee 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -339,10 +339,7 @@ template("declarative_js_engine_ark") { if (is_arkui_x) { deps += [ "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl" ] } - external_deps = [ - "ability_base:extractortool", - "graphic_2d:drawing_napi_impl", - ] + external_deps = [ "graphic_2d:drawing_napi_impl" ] if (!build_ohos_sdk && !is_arkui_x) { external_deps += [ "ets_utils:console", -- Gitee From 38b2823464f043355c677918d074cd30d6b658e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Thu, 11 Sep 2025 08:40:17 +0000 Subject: [PATCH 08/12] update frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../engine/jsi/jsi_declarative_engine.cpp | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index 1c1fc7aa328..e508c731748 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -23,7 +23,6 @@ #include #include "dfx_jsnapi.h" -#include "extractor.h" #if !defined(PREVIEW) && !defined(ANDROID_PLATFORM) && !defined(IOS_PLATFORM) #include "console.h" @@ -1695,6 +1694,9 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c } return true; } + if (!delegate->GetAssetContent(FORM_ES_MODULE_CARD_PATH, content)) { + return false; + } const std::string bundleName = frontEnd->GetBundleName(); std::string moduleName = frontEnd->GetModuleName(); #ifdef PREVIEW @@ -1716,23 +1718,12 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c abcPath = moduleName.append("/").append(fileName); #endif { - bool flag = false; - const std::string hapFilePath = container->GetHapPath(); - std::shared_ptr extractor = - AbilityBase::ExtractorUtil::GetExtractor(hapFilePath, flag, false); - if (extractor == nullptr) { - TAG_LOGE(AceLogTag::ACE_ROUTER, "hapFilePath %{private}s GetExtractor failed", hapFilePath.c_str()); - return false; - } - auto data = extractor->GetSafeData(FORM_ES_MODULE_CARD_PATH); - if (!data) { - TAG_LOGE(AceLogTag::ACE_ROUTER, "null data"); + if (arkRuntime->IsStaticOrInvalidFile(content.data(), content.size())) { return false; } - if (arkRuntime->IsStaticOrInvalidFile(data->GetDataPtr(), data->GetDataLen())) { - return false; - } - if (!arkRuntime->ExecuteModuleBufferSecure(data->GetDataPtr(), data->GetDataLen(), abcPath, true)) { + } + { + if (!arkRuntime->ExecuteModuleBufferSecure(content.data(), content.size(), abcPath, true)) { return false; } } -- Gitee From 740ed67ee2b7d2cf18713b4ff7036ffbf3dd051e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Fri, 12 Sep 2025 08:29:14 +0000 Subject: [PATCH 09/12] update frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../engine/jsi/jsi_declarative_engine.cpp | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp index e508c731748..1c1fc7aa328 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.cpp @@ -23,6 +23,7 @@ #include #include "dfx_jsnapi.h" +#include "extractor.h" #if !defined(PREVIEW) && !defined(ANDROID_PLATFORM) && !defined(IOS_PLATFORM) #include "console.h" @@ -1694,9 +1695,6 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c } return true; } - if (!delegate->GetAssetContent(FORM_ES_MODULE_CARD_PATH, content)) { - return false; - } const std::string bundleName = frontEnd->GetBundleName(); std::string moduleName = frontEnd->GetModuleName(); #ifdef PREVIEW @@ -1718,12 +1716,23 @@ bool JsiDeclarativeEngine::ExecuteCardAbc(const std::string& fileName, int64_t c abcPath = moduleName.append("/").append(fileName); #endif { - if (arkRuntime->IsStaticOrInvalidFile(content.data(), content.size())) { + bool flag = false; + const std::string hapFilePath = container->GetHapPath(); + std::shared_ptr extractor = + AbilityBase::ExtractorUtil::GetExtractor(hapFilePath, flag, false); + if (extractor == nullptr) { + TAG_LOGE(AceLogTag::ACE_ROUTER, "hapFilePath %{private}s GetExtractor failed", hapFilePath.c_str()); return false; } - } - { - if (!arkRuntime->ExecuteModuleBufferSecure(content.data(), content.size(), abcPath, true)) { + auto data = extractor->GetSafeData(FORM_ES_MODULE_CARD_PATH); + if (!data) { + TAG_LOGE(AceLogTag::ACE_ROUTER, "null data"); + return false; + } + if (arkRuntime->IsStaticOrInvalidFile(data->GetDataPtr(), data->GetDataLen())) { + return false; + } + if (!arkRuntime->ExecuteModuleBufferSecure(data->GetDataPtr(), data->GetDataLen(), abcPath, true)) { return false; } } -- Gitee From f2e7e980742e61e5c1299bd4cde25fbc82659afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Fri, 12 Sep 2025 08:31:07 +0000 Subject: [PATCH 10/12] update frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../bridge/declarative_frontend/engine/jsi/BUILD.gn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 92d296228ee..3b0985ea622 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -339,7 +339,10 @@ template("declarative_js_engine_ark") { if (is_arkui_x) { deps += [ "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl" ] } - external_deps = [ "graphic_2d:drawing_napi_impl" ] + external_deps = [ + "ability_base:extractortool", + "graphic_2d:drawing_napi_impl", + ] if (!build_ohos_sdk && !is_arkui_x) { external_deps += [ "ets_utils:console", @@ -419,6 +422,9 @@ template("declarative_js_engine_ark") { if (defined(vendor_configs.extra_view_register_sources)) { include_dirs += vendor_configs.ace_advance_dirs sources += vendor_configs.extra_view_register_sources + if (platform == "ohos_ng") { + sources += vendor_configs.ace_engine_advanced_jsview + } } else { sources += [ "jsi_extra_view_register.cpp" ] } -- Gitee From 9ee90a1eef56240d5d12006d6d793256e23487f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Fri, 12 Sep 2025 09:17:26 +0000 Subject: [PATCH 11/12] update frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../bridge/declarative_frontend/engine/jsi/BUILD.gn | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 3b0985ea622..6131beb4cce 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -339,12 +339,10 @@ template("declarative_js_engine_ark") { if (is_arkui_x) { deps += [ "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl" ] } - external_deps = [ - "ability_base:extractortool", - "graphic_2d:drawing_napi_impl", - ] + external_deps = [ "graphic_2d:drawing_napi_impl" ] if (!build_ohos_sdk && !is_arkui_x) { external_deps += [ + "ability_base:extractortool", "ets_utils:console", "ets_utils:timer" ] @@ -422,9 +420,6 @@ template("declarative_js_engine_ark") { if (defined(vendor_configs.extra_view_register_sources)) { include_dirs += vendor_configs.ace_advance_dirs sources += vendor_configs.extra_view_register_sources - if (platform == "ohos_ng") { - sources += vendor_configs.ace_engine_advanced_jsview - } } else { sources += [ "jsi_extra_view_register.cpp" ] } -- Gitee From cbf85c5bf3402e7b06a143b0b4fefabee75dd7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Sat, 13 Sep 2025 03:28:45 +0000 Subject: [PATCH 12/12] update frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn index 6131beb4cce..18d0b09bc66 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn @@ -342,11 +342,13 @@ template("declarative_js_engine_ark") { external_deps = [ "graphic_2d:drawing_napi_impl" ] if (!build_ohos_sdk && !is_arkui_x) { external_deps += [ - "ability_base:extractortool", "ets_utils:console", "ets_utils:timer" ] } + if (is_ohos_standard_system && !use_mingw_win && !use_mac && !use_linux) { + external_deps += [ "ability_base:extractortool" ] + } if (use_hilog) { external_deps += [ "hilog:libhilog" ] } -- Gitee