diff options
| -rw-r--r-- | dist/Android.bp | 3 | ||||
| -rw-r--r-- | dist/Android.patch | 12 | ||||
| -rw-r--r-- | dist/shell.c | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/dist/Android.bp b/dist/Android.bp index dfd29d9..54cd389 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -133,9 +133,6 @@ cc_binary { "liblog", "libutils", ], - static_libs: [ - "libicuandroid_utils", - ], }, host: { cflags: ["-DNO_ANDROID_FUNCS=1"], diff --git a/dist/Android.patch b/dist/Android.patch index 51ab92d..307a832 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,12 +1,12 @@ ---- orig/shell.c 2019-01-07 14:22:53.308198437 -0800 -+++ shell.c 2019-01-07 14:22:53.356198069 -0800 +--- orig/shell.c 2018-04-17 11:53:05.520972146 +0100 ++++ shell.c 2019-03-14 19:26:19.523122555 +0000 @@ -87,6 +87,12 @@ #endif #include <ctype.h> #include <stdarg.h> +// Begin Android Add +#ifndef NO_ANDROID_FUNCS -+#include "IcuUtils.h" ++#include <aicu/AIcu.h> +#include <sqlite3_android.h> +#endif +// End Android Add @@ -20,7 +20,7 @@ + + // Begin Android Add + #ifndef NO_ANDROID_FUNCS -+ InitializeIcuOrDie(); ++ AIcu_initializeIcuOrDie(); + int err = register_localized_collators(p->db, "en_US", 0); + if (err != SQLITE_OK) { + fprintf(stderr, "register_localized_collators() failed\n"); @@ -37,8 +37,8 @@ if( p->openMode==SHELL_OPEN_ZIPFILE ){ char *zSql = sqlite3_mprintf( "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename); ---- orig/sqlite3.c 2019-01-07 14:24:24.503497740 -0800 -+++ sqlite3.c 2019-01-07 14:24:24.871494912 -0800 +--- orig/sqlite3.c 2019-03-11 19:52:44.237549639 +0000 ++++ sqlite3.c 2019-03-11 19:52:44.293549396 +0000 @@ -30672,6 +30672,10 @@ # include <sys/mount.h> #endif diff --git a/dist/shell.c b/dist/shell.c index 735aaff..73f8b85 100644 --- a/dist/shell.c +++ b/dist/shell.c @@ -89,7 +89,7 @@ typedef unsigned char u8; #include <stdarg.h> // Begin Android Add #ifndef NO_ANDROID_FUNCS -#include "IcuUtils.h" +#include <aicu/AIcu.h> #include <sqlite3_android.h> #endif // End Android Add @@ -10398,7 +10398,7 @@ static void open_db(ShellState *p, int keepAlive){ // Begin Android Add #ifndef NO_ANDROID_FUNCS - InitializeIcuOrDie(); + AIcu_initializeIcuOrDie(); int err = register_localized_collators(p->db, "en_US", 0); if (err != SQLITE_OK) { fprintf(stderr, "register_localized_collators() failed\n"); |