From 7cac2417847d868cc78410a0a17d3bc834489028 Mon Sep 17 00:00:00 2001 From: Shimenkov Mikhail Date: Tue, 1 Jul 2025 14:28:20 +0300 Subject: [PATCH] Change ani mangling Change-Id: I087db1761cb1f2f95077518a03de82f1d117af90 Signed-off-by: Shimenkov Mikhail --- .../js/ani/vibrator/include/ani_utils.h | 16 +++++++------- .../js/ani/vibrator/src/vibrator_ani.cpp | 22 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/frameworks/js/ani/vibrator/include/ani_utils.h b/frameworks/js/ani/vibrator/include/ani_utils.h index 663a794..5b975b3 100644 --- a/frameworks/js/ani/vibrator/include/ani_utils.h +++ b/frameworks/js/ani/vibrator/include/ani_utils.h @@ -88,25 +88,25 @@ private: template<> bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Boolean;"); + return IsInstanceOf("C{std.core.Boolean}"); } template<> bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Int;"); + return IsInstanceOf("C{std.core.Int}"); } template<> bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/Double;"); + return IsInstanceOf("C{std.core.Double}"); } template<> bool UnionAccessor::IsInstanceOfType() { - return IsInstanceOf("Lstd/core/String;"); + return IsInstanceOf("C{std.core.String}"); } template<> @@ -178,7 +178,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value) } for (int i = 0; i < int(length); i++) { ani_ref ref; - if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "I:Lstd/core/Object;", &ref, (ani_int)i)) { + if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "i:C{std.core.Object}", &ref, (ani_int)i)) { std::cerr << "Object_GetPropertyByName_Ref failed" << std::endl; return false; } @@ -202,7 +202,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value) } for (int i = 0; i < int(length); i++) { ani_ref ref; - if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "I:Lstd/core/Object;", &ref, (ani_int)i)) { + if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "i:C{std.core.Object}", &ref, (ani_int)i)) { std::cerr << "Object_GetPropertyByName_Ref failed" << std::endl; return false; } @@ -226,7 +226,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value) } for (int i = 0; i < int(length); i++) { ani_ref ref; - if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "I:Lstd/core/Object;", &ref, (ani_int)i)) { + if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "i:C{std.core.Object}", &ref, (ani_int)i)) { std::cerr << "Object_GetPropertyByName_Ref failed" << std::endl; return false; } @@ -273,7 +273,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value for (int i = 0; i < int(length); i++) { ani_ref ref; - if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "I:Lstd/core/Object;", &ref, (ani_int)i)) { + if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "i:C{std.core.Object}", &ref, (ani_int)i)) { std::cerr << "Object_GetPropertyByName_Double length failed" << std::endl; return false; } diff --git a/frameworks/js/ani/vibrator/src/vibrator_ani.cpp b/frameworks/js/ani/vibrator/src/vibrator_ani.cpp index f4ce442..a224a2c 100644 --- a/frameworks/js/ani/vibrator/src/vibrator_ani.cpp +++ b/frameworks/js/ani/vibrator/src/vibrator_ani.cpp @@ -74,14 +74,14 @@ typedef struct VibrateInfo { static void ThrowBusinessError(ani_env *env, int errCode, std::string&& errMsg) { MISC_HILOGD("Begin ThrowBusinessError."); - static const char *errorClsName = "L@ohos/base/BusinessError;"; + static const char *errorClsName = "C{@ohos.base.BusinessError}"; ani_class cls {}; if (ANI_OK != env->FindClass(errorClsName, &cls)) { MISC_HILOGE("find class BusinessError %{public}s failed", errorClsName); return; } ani_method ctor; - if (ANI_OK != env->Class_FindMethod(cls, "", ":V", &ctor)) { + if (ANI_OK != env->Class_FindMethod(cls, "", ":", &ctor)) { MISC_HILOGE("find method BusinessError.constructor failed"); return; } @@ -698,16 +698,16 @@ ani_class FindClassInNamespace(ani_env *env, ani_namespace &ns, const char *clas static bool ParseEffectTypeAndParameters(ani_env *env, ani_object effect, VibrateInfo &vibrateInfo) { ani_namespace ns; - static const char *namespaceName = "L@ohos/vibrator/vibrator;"; + static const char *namespaceName = "C{@ohos.vibrator.vibrator}"; if (ANI_OK != env->FindNamespace(namespaceName, &ns)) { MISC_HILOGE("Not found '%{public}s'", namespaceName); return false; } - ani_class vibrateTimeClass = FindClassInNamespace(env, ns, "LVibrateTime;"); - ani_class vibratePresetClass = FindClassInNamespace(env, ns, "LVibratePreset;"); - ani_class vibrateFromFileClass = FindClassInNamespace(env, ns, "LVibrateFromFile;"); - ani_class vibratePatternClass = FindClassInNamespace(env, ns, "LVibrateFromPattern;"); + ani_class vibrateTimeClass = FindClassInNamespace(env, ns, "C{VibrateTime}"); + ani_class vibratePresetClass = FindClassInNamespace(env, ns, "C{VibratePreset}"); + ani_class vibrateFromFileClass = FindClassInNamespace(env, ns, "C{VibrateFromFile}"); + ani_class vibratePatternClass = FindClassInNamespace(env, ns, "C{VibrateFromPattern}"); if (!vibrateTimeClass || !vibratePresetClass || !vibrateFromFileClass || !vibratePatternClass) { return false; } @@ -752,13 +752,13 @@ static bool ParseEffectTypeAndParameters(ani_env *env, ani_object effect, Vibrat static void StartVibrationSync([[maybe_unused]] ani_env *env, ani_object effect, ani_object attribute) { ani_namespace ns; - static const char *namespaceName = "L@ohos/vibrator/vibrator;"; + static const char *namespaceName = "C{@ohos.vibrator.vibrator}"; if (ANI_OK != env->FindNamespace(namespaceName, &ns)) { MISC_HILOGE("Not found '%{public}s'", namespaceName); return; } - ani_class vibrateAttributeClass = FindClassInNamespace(env, ns, "LVibrateAttribute;"); + ani_class vibrateAttributeClass = FindClassInNamespace(env, ns, "C{VibrateAttribute}"); if (!vibrateAttributeClass) { return; } @@ -794,7 +794,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) return ANI_ERROR; } - static const char *namespaceName = "L@ohos/vibrator/vibrator;"; + static const char *namespaceName = "C{@ohos.vibrator.vibrator}"; ani_namespace ns; if (ANI_OK != env->FindNamespace(namespaceName, &ns)) { MISC_HILOGE("Not found '%{public}s'", namespaceName); @@ -813,4 +813,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) *result = ANI_VERSION_1; return ANI_OK; -} \ No newline at end of file +} -- Gitee