From 61f41da47d8ebb15af5a3d9fd6f5e76a259c1b29 Mon Sep 17 00:00:00 2001 From: chengzhihao Date: Mon, 9 Jun 2025 15:52:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=96=B0=E9=9C=80=E6=B1=82]:=200328=20mer?= =?UTF-8?q?ge=20to=200702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICJYED Signed-off-by: chengzhihao --- frameworks/ets/ets/@ohos.app.ability.Want.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/ets/ets/@ohos.app.ability.Want.ets b/frameworks/ets/ets/@ohos.app.ability.Want.ets index 2d81ad45d82..1389768cb6a 100644 --- a/frameworks/ets/ets/@ohos.app.ability.Want.ets +++ b/frameworks/ets/ets/@ohos.app.ability.Want.ets @@ -44,7 +44,7 @@ class RecordWriter { } else { const objType = Type.of(obj); if (objType instanceof ArrayType) { - this.writeBuildArray(obj as Object, Value.of(obj) as ArrayValue); + this.writeBuildArray(obj as Object, reflect.Value.of(obj) as ArrayValue); } else { this.buffer.append('null'); } -- Gitee From 77843e769533573d47ee7246c546e745a3dbfebf Mon Sep 17 00:00:00 2001 From: yangzk Date: Fri, 6 Jun 2025 10:51:50 +0800 Subject: [PATCH 2/3] Description: add hybrid js module reader IssueNo: Sig: SIG_ApplicationFramework Feature or Bugfix: Bugfix Binary Source: No Signed-off-by: yangzk Change-Id: Ibde52b60148e239336569bd24689e94a4d67a5a0 --- frameworks/native/runtime/ets_runtime.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frameworks/native/runtime/ets_runtime.cpp b/frameworks/native/runtime/ets_runtime.cpp index bd546e081bb..647ddae0219 100644 --- a/frameworks/native/runtime/ets_runtime.cpp +++ b/frameworks/native/runtime/ets_runtime.cpp @@ -196,6 +196,10 @@ std::unique_ptr ETSRuntime::Create(const Options &options, std::uniq if (instance != nullptr && !options.preload) { instance->PostFork(options, jsRuntime); } +<<<<<<< HEAD +======= + EntryPathManager::GetInstance().Init(); +>>>>>>> dab746d5c9 (Description: add hybrid js module reader) return instance; } @@ -279,6 +283,12 @@ bool ETSRuntime::Initialize(const Options &options, std::unique_ptr & return false; } + if (jsRuntime_ != nullptr) { + auto vm = static_cast(jsRuntime_.get())->GetEcmaVm(); + panda::JSNApi::SetHostResolveBufferTrackerForHybridApp( + vm, HybridJsModuleReader(options.bundleName, options.hapPath, options.isUnique)); + } + apiTargetVersion_ = options.apiTargetVersion; TAG_LOGD(AAFwkTag::ETSRUNTIME, "Initialize: %{public}d", apiTargetVersion_); return true; -- Gitee From ce41aad15da3a359f30a1a257fb878c73c8852cd Mon Sep 17 00:00:00 2001 From: yangzk Date: Mon, 30 Jun 2025 09:34:35 +0800 Subject: [PATCH 3/3] Revert "[draft][cannot merged] Description: load abc cannot mergegit add .git add .git add .git add .git add .git add .git add .git add . temp" This reverts commit 85f570ada7e61793cd85ee2389f525f3cd622bf0. Signed-off-by: yangzk Change-Id: I5ade5fc4cf52be9722359bef54817ec0f782186c Signed-off-by: tengtengh --- frameworks/native/runtime/ets_runtime.cpp | 4 ---- frameworks/native/runtime/js_module_reader.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/frameworks/native/runtime/ets_runtime.cpp b/frameworks/native/runtime/ets_runtime.cpp index 647ddae0219..fd8339c8ec0 100644 --- a/frameworks/native/runtime/ets_runtime.cpp +++ b/frameworks/native/runtime/ets_runtime.cpp @@ -196,10 +196,6 @@ std::unique_ptr ETSRuntime::Create(const Options &options, std::uniq if (instance != nullptr && !options.preload) { instance->PostFork(options, jsRuntime); } -<<<<<<< HEAD -======= - EntryPathManager::GetInstance().Init(); ->>>>>>> dab746d5c9 (Description: add hybrid js module reader) return instance; } diff --git a/frameworks/native/runtime/js_module_reader.cpp b/frameworks/native/runtime/js_module_reader.cpp index daf52bd7976..bbfe46a87a1 100755 --- a/frameworks/native/runtime/js_module_reader.cpp +++ b/frameworks/native/runtime/js_module_reader.cpp @@ -69,8 +69,8 @@ bool JsModuleReader::operator()(const std::string& inputPath, uint8_t **buff, TAG_LOGE(AAFwkTag::JSRUNTIME, "empty realHapPath"); return false; } + needFindPluginHsp_ = true; } - needFindPluginHsp_ = true; bool newCreate = false; std::shared_ptr extractor = ExtractorUtil::GetExtractor(realHapPath, newCreate); -- Gitee