зеркало из https://github.com/CryptoPro/runtime.git
Fixing tests on android. (#36788)
The linker was removing the icu shim functions even exporting them. The unique solution that we found until now is to force the linking using the -u flag. This is a temporary fix until we don't implement QCalls. Fixes https://github.com/dotnet/runtime/issues/36685
This commit is contained in:
Родитель
c1052b40b9
Коммит
45e20479ee
|
@ -1272,7 +1272,7 @@ retry_with_libcoreclr:
|
||||||
new_scope = g_strdup ("libcoreclr.dylib");
|
new_scope = g_strdup ("libcoreclr.dylib");
|
||||||
#else
|
#else
|
||||||
#if defined(TARGET_ANDROID)
|
#if defined(TARGET_ANDROID)
|
||||||
new_scope = g_strdup ("libmonosgen-2.0.so");
|
new_scope = g_strdup ("libruntime-android.so");
|
||||||
#else
|
#else
|
||||||
new_scope = g_strdup ("libcoreclr.so");
|
new_scope = g_strdup ("libcoreclr.so");
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -13,4 +13,14 @@ target_link_libraries(
|
||||||
runtime-android
|
runtime-android
|
||||||
%NativeLibrariesToLink%
|
%NativeLibrariesToLink%
|
||||||
libz.so
|
libz.so
|
||||||
log)
|
log
|
||||||
|
"-u GlobalizationNative_LoadICU"
|
||||||
|
"-u GlobalizationNative_GetLatestJapaneseEra"
|
||||||
|
"-u GlobalizationNative_ChangeCase"
|
||||||
|
"-u GlobalizationNative_CloseSortHandle"
|
||||||
|
"-u GlobalizationNative_GetLocales"
|
||||||
|
"-u GlobalizationNative_GetLocaleInfoInt"
|
||||||
|
"-u GlobalizationNative_GetLocaleTimeFormat"
|
||||||
|
"-u GlobalizationNative_ToUnicode"
|
||||||
|
"-u GlobalizationNative_NormalizeString"
|
||||||
|
"-u GlobalizationNative_GetTimeZoneDisplayName")
|
||||||
|
|
Загрузка…
Ссылка в новой задаче