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

Compatible with @hms system library under the new ohmurl format

Browse Source 
Signed-off-by: chenlincl3 <chenlin201@huawei.com>
Change-Id: Icb569c8504b91e4438753f15612908474f0db419
This commit is contained in:
chenlincl3 2024-05-24 15:04:52 +08:00
parent 6dcfb1d6f9
commit 0c5615cfb8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ecmascript/module/module_path_helper.cpp
View File

@ -21,7 +21,8 @@ namespace panda::ecmascript {
CString ModulePathHelper::ConcatFileNameWithMerge(JSThread *thread, const JSPandaFile *jsPandaFile,
CString &baseFileName, CString recordName, CString requestName)
{
if (thread->GetEcmaVM()->IsNormalizedOhmUrlPack()) {
if (thread->GetEcmaVM()->IsNormalizedOhmUrlPack() && !StringHelper::StringStartWith(requestName, PREFIX_BUNDLE) &&
!StringHelper::StringStartWith(requestName, PREFIX_PACKAGE)) {
return ConcatMergeFileNameToNormalized(thread, jsPandaFile, baseFileName, recordName, requestName);
}
@ -60,9 +61,7 @@ CString ModulePathHelper::ConcatMergeFileNameToNormalized(JSThread *thread, cons
CString &baseFileName, CString recordName, CString requestName)
{
if (!StringHelper::StringStartWith(requestName, PREFIX_NORMALIZED)) {
if (StringHelper::StringStartWith(requestName, PREFIX_BUNDLE) ||
StringHelper::StringStartWith(requestName, PREFIX_PACKAGE) ||
StringHelper::StringStartWith(requestName, PREFIX_ETS)) {
if (StringHelper::StringStartWith(requestName, PREFIX_ETS)) {
CString msg = "can not use different packing ways in same app, current requestName is " + requestName;
THROW_REFERENCE_ERROR_AND_RETURN(thread, msg.c_str(), "");
}