From 2a93f5532a7b36a6e33463de334bb3a327c5bcaf Mon Sep 17 00:00:00 2001 From: Otto Eotvos Date: Tue, 27 May 2025 11:00:10 +0200 Subject: [PATCH] Update hardcoded names affected by name mangling Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/IBTJ09 Change-Id: I19d9c83e2f4b8f28c1e876d10c7b44713fe01b66 Signed-off-by: Otto Eotvos --- .../ability_delegator/src/sts_ability_delegator_utils.cpp | 8 ++++---- .../ets/ani/ani_common/src/ani_common_ability_result.cpp | 4 ++-- frameworks/ets/ani/ani_common/src/ani_common_want.cpp | 4 ++-- .../ani/form_extension_ability/src/sts_form_extension.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator_utils.cpp b/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator_utils.cpp index b1bf66b7c57..43e3275467e 100644 --- a/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator_utils.cpp +++ b/frameworks/ets/ani/ability_delegator/src/sts_ability_delegator_utils.cpp @@ -97,7 +97,7 @@ void SetBundleName(ani_env *aniEnv, ani_class arguments, ani_object argumentObje // find the setter method ani_method nameSetter; - status = aniEnv->Class_FindMethod(arguments, "bundleName", nullptr, &nameSetter); + status = aniEnv->Class_FindMethod(arguments, "%%set-bundleName", nullptr, &nameSetter); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod failed status: %{public}d", status); return; @@ -146,7 +146,7 @@ void SetParameters(ani_env *aniEnv, ani_class arguments, ani_object argumentObje // get parameters ref of object ani_ref parameterRef; - status = aniEnv->Object_CallMethodByName_Ref(argumentObject, "parameters", ":Lescompat/Record;", + status = aniEnv->Object_CallMethodByName_Ref(argumentObject, "%%get-parameters", ":Lescompat/Record;", ¶meterRef); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Object_CallMethodByName_Ref failed status: %{public}d", status); @@ -200,7 +200,7 @@ void SetTestCaseNames(ani_env *aniEnv, ani_class arguments, ani_object argumentO // find the setter method ani_method nameSetter; - status = aniEnv->Class_FindMethod(arguments, "testCaseNames", nullptr, &nameSetter); + status = aniEnv->Class_FindMethod(arguments, "%%set-testCaseNames", nullptr, &nameSetter); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod failed status: %{public}d", status); return; @@ -234,7 +234,7 @@ void SetTestRunnerClassName(ani_env *aniEnv, ani_class arguments, ani_object arg // find the setter method ani_method nameSetter; - status = aniEnv->Class_FindMethod(arguments, "testRunnerClassName", nullptr, &nameSetter); + status = aniEnv->Class_FindMethod(arguments, "%%set-testRunnerClassName", nullptr, &nameSetter); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::DELEGATOR, "Class_FindMethod failed status: %{public}d", status); return; diff --git a/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp b/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp index acdaac1322f..6bd127c8d7b 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_ability_result.cpp @@ -45,7 +45,7 @@ ani_object WrapAbilityResult(ani_env *env, int32_t resultCode, const AAFwk::Want } ani_method resultCodeSetter = nullptr; - if ((status = env->Class_FindMethod(cls, "resultCode", nullptr, &resultCodeSetter)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "%%set-resultCode", nullptr, &resultCodeSetter)) != ANI_OK) { TAG_LOGE(AAFwkTag::STSRUNTIME, "status : %{public}d", status); } @@ -56,7 +56,7 @@ ani_object WrapAbilityResult(ani_env *env, int32_t resultCode, const AAFwk::Want } ani_method wantSetter = nullptr; - if ((status = env->Class_FindMethod(cls, "want", nullptr, &wantSetter)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "%%set-want", nullptr, &wantSetter)) != ANI_OK) { TAG_LOGE(AAFwkTag::STSRUNTIME, "status : %{public}d", status); } diff --git a/frameworks/ets/ani/ani_common/src/ani_common_want.cpp b/frameworks/ets/ani/ani_common/src/ani_common_want.cpp index 81e684d9b69..7a016915864 100644 --- a/frameworks/ets/ani/ani_common/src/ani_common_want.cpp +++ b/frameworks/ets/ani/ani_common/src/ani_common_want.cpp @@ -318,7 +318,7 @@ bool GetAbilityResultClass(ani_env *env, ani_class &cls) bool GetResultCode(ani_env *env, ani_object param, ani_class cls, int &resultCode) { ani_method method {}; - ani_status status = env->Class_FindMethod(cls, "resultCode", nullptr, &method); + ani_status status = env->Class_FindMethod(cls, "%%get-resultCode", nullptr, &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::JSNAPI, "status: %{public}d", status); return false; @@ -336,7 +336,7 @@ bool GetResultCode(ani_env *env, ani_object param, ani_class cls, int &resultCod bool GetWantReference(ani_env *env, ani_object param, ani_class cls, ani_ref &wantRef) { ani_method method {}; - ani_status status = env->Class_FindMethod(cls, "want", nullptr, &method); + ani_status status = env->Class_FindMethod(cls, "%%get-want", nullptr, &method); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::JSNAPI, "status: %{public}d", status); return false; diff --git a/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp b/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp index c8ccbbadf84..8680ee5f052 100644 --- a/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp +++ b/frameworks/ets/ani/form_extension_ability/src/sts_form_extension.cpp @@ -344,7 +344,7 @@ bool STSFormExtension::ExtractFormData(ani_env *env, ani_ref nativeResult, AppEx } ani_method data{}; - status = env->Class_FindMethod(cls, "data", nullptr, &data); + status = env->Class_FindMethod(cls, "%%get-data", nullptr, &data); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod data status: %{public}d", status); return false; @@ -361,7 +361,7 @@ bool STSFormExtension::ExtractFormData(ani_env *env, ani_ref nativeResult, AppEx formData = AppExecFwk::FormProviderData(dataStr); ani_method proxies; - status = env->Class_FindMethod(cls, "proxies", nullptr, &proxies); + status = env->Class_FindMethod(cls, "%%get-proxies", nullptr, &proxies); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::FORM_EXT, "Class_FindMethod proxies status: %{public}d", status); return true; -- Gitee