Jelajahi Sumber

* cwstring: Added ICU versions for new versions of Android.

Yuriy Sydorov 3 tahun lalu
induk
melakukan
487721dea8
1 mengubah file dengan 6 tambahan dan 2 penghapusan
  1. 6 2
      rtl/android/cwstring.pp

+ 6 - 2
rtl/android/cwstring.pp

@@ -522,7 +522,9 @@ end;
 
 
 function LoadICU: boolean;
 function LoadICU: boolean;
 const
 const
-  ICUver: array [1..12] of ansistring = ('3_8', '4_2', '44', '46', '48', '50', '51', '53', '55', '56', '58', '60');
+  ICUver: array [1..15] of ansistring =
+    ('3_8', '4_2', '44', '46', '48', '50', '51', '53', '55', '56', '58', '60',
+     '63', '66', '68');
   TestProcName = 'ucnv_open';
   TestProcName = 'ucnv_open';
 
 
 var
 var
@@ -623,7 +625,9 @@ initialization
     SysGetIcuProc:=@GetIcuProc;
     SysGetIcuProc:=@GetIcuProc;
     SetStdIOCodePages;
     SetStdIOCodePages;
     {$endif android}
     {$endif android}
-  end;
+  end
+  else
+    SysLogWrite(ANDROID_LOG_ERROR, 'cwstring: Failed to load ICU.');
 
 
 finalization
 finalization
   SetUnicodeStringManager(oldm);
   SetUnicodeStringManager(oldm);