openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 18:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt import har worker

Browse Source 
Issue:https://e.gitee.com/open_harmony/dashboard?issue=I8KU1Y

Signed-off-by: yaochaonan <yaochaonan@huawei.com>
Change-Id: Ic410cc6ba20ccd67c57b9bc80a87794a7db404df
This commit is contained in:
yaochaonan 2023-11-30 19:09:23 +08:00
parent 96162a0358
commit 52bf8d2ad0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ecmascript/module/module_path_helper.cpp
View File

@ -53,7 +53,7 @@ CString ModulePathHelper::ConcatFileNameWithMerge(JSThread *thread, const JSPand
} }
/* /*
* Before: inputFileName: 1. /data/storage/el1/bundle/moduleName/ets/xxx/xxx.abc * Before: inputFileName: 1. /data/storage/el1/bundle/moduleName@namespace/ets/xxx/xxx.abc
2. @bundle:bundleName/moduleName/ets/xxx/xxx.abc 2. @bundle:bundleName/moduleName/ets/xxx/xxx.abc
3. moduleName/ets/xxx/xxx.abc 3. moduleName/ets/xxx/xxx.abc
4. .test/xxx/xxx.abc 4. .test/xxx/xxx.abc
@ -72,12 +72,13 @@ void ModulePathHelper::ParseOhmUrl(EcmaVM *vm, const CString &inputFileName,
pos = startStrLen; pos = startStrLen;
} }
if (pos != CString::npos) { if (pos != CString::npos) {
// inputFileName: /data/storage/el1/bundle/moduleName/ets/xxx/xxx.abc // inputFileName: /data/storage/el1/bundle/moduleName@namespace/ets/xxx/xxx.abc
pos = inputFileName.find(PathHelper::SLASH_TAG, startStrLen); pos = inputFileName.find(PathHelper::SLASH_TAG, startStrLen);
if (pos == CString::npos) { if (pos == CString::npos) {
LOG_FULL(FATAL) << "Invalid Ohm url, please check."; LOG_FULL(FATAL) << "Invalid Ohm url, please check.";
} }
CString moduleName = inputFileName.substr(startStrLen, pos - startStrLen); CString moduleName = inputFileName.substr(startStrLen, pos - startStrLen);
PathHelper::DeleteNamespace(moduleName);
outBaseFileName = BUNDLE_INSTALL_PATH + moduleName + MERGE_ABC_ETS_MODULES; outBaseFileName = BUNDLE_INSTALL_PATH + moduleName + MERGE_ABC_ETS_MODULES;
outEntryPoint = vm->GetBundleName() + PathHelper::SLASH_TAG + inputFileName.substr(startStrLen); outEntryPoint = vm->GetBundleName() + PathHelper::SLASH_TAG + inputFileName.substr(startStrLen);
} else { } else {