diff options
| author | Victor Chang <vfcc@google.com> | 2019-03-25 17:09:04 +0000 |
|---|---|---|
| committer | Victor Chang <vfcc@google.com> | 2019-03-25 19:29:59 +0000 |
| commit | 16d7b73cdacf50925ea1238e59877477ef1c7558 (patch) | |
| tree | 8933578b072bcf3a642d14bdbe61e6d883749b55 /dist | |
| parent | 5148bb2b921ee84709d3924aecbad69d77300aff (diff) | |
Revert "[fuchsia] Add Fuchsia support to SQLite."
This reverts commit 5148bb2b921ee84709d3924aecbad69d77300aff.
Reason for revert: Using deprecated libraries.
Merged-In: I6b84f88c9b726e28dc0188ceb0585ec8a732d091
Change-Id: I1b42d09203da163d5abebc7b45bea7b71ac1fd18
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/Android.bp | 31 | ||||
| -rw-r--r-- | dist/Android.patch | 23 | ||||
| -rw-r--r-- | dist/sqlite3.c | 4 |
3 files changed, 6 insertions, 52 deletions
diff --git a/dist/Android.bp b/dist/Android.bp index 43304a0..54cd389 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -61,13 +61,6 @@ cc_defaults { "-DHAVE_MALLOC_USABLE_SIZE", ], }, - fuchsia: { - cflags: [ - "-Dfdatasync=fdatasync", - "-DHAVE_MALLOC_H=1", - "-DHAVE_MALLOC_USABLE_SIZE", - ], - }, }, } @@ -94,18 +87,6 @@ cc_library { // include android specific methods whole_static_libs: ["libsqlite3_android"], }, - fuchsia: { - shared_libs: [ - "liblog", - "libutils", - "libicuuc", - "libicui18n", - ], - cflags: ["-DSQLITE_ENABLE_ICU"], - - // include android specific methods - whole_static_libs: ["libsqlite3_android"], - }, host: { static_libs: [ "liblog", @@ -153,18 +134,6 @@ cc_binary { "libutils", ], }, - fuchsia: { - shared_libs: [ - "libsqlite", - "libicuuc", - "libicui18n", - "liblog", - "libutils", - ], - static_libs: [ - "libicuandroid_utils", - ], - }, host: { cflags: ["-DNO_ANDROID_FUNCS=1"], static_libs: [ diff --git a/dist/Android.patch b/dist/Android.patch index 80873e2..307a832 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,5 +1,5 @@ ---- orig/shell.c 2018-06-15 18:37:50.651936274 -0700 -+++ shell.c 2019-03-18 16:45:23.691937057 -0700 +--- 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> @@ -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-03-18 16:45:23.687937080 -0700 -+++ sqlite3.c 2019-03-18 16:45:24.723931232 -0700 +--- 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 @@ -104,18 +104,7 @@ goto shm_open_err; } -@@ -38434,6 +38450,10 @@ - UNIXVFS("unix", autolockIoFinder ), - #elif OS_VXWORKS - UNIXVFS("unix", vxworksIoFinder ), -+#elif __Fuchsia__ -+ /* None of the system calls for other exclusion methods are currently -+ ** implemented on Fuchsia, so use simple dot-file locking for now. */ -+ UNIXVFS("unix", dotlockIoFinder ), - #else - UNIXVFS("unix", posixIoFinder ), - #endif -@@ -118054,7 +118074,7 @@ +@@ -118054,7 +118070,7 @@ } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -124,7 +113,7 @@ goto initone_error_out; } -@@ -152769,13 +152789,25 @@ +@@ -152769,13 +152785,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc diff --git a/dist/sqlite3.c b/dist/sqlite3.c index 1931481..18b8246 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -38450,10 +38450,6 @@ SQLITE_API int sqlite3_os_init(void){ UNIXVFS("unix", autolockIoFinder ), #elif OS_VXWORKS UNIXVFS("unix", vxworksIoFinder ), -#elif __Fuchsia__ - /* None of the system calls for other exclusion methods are currently - ** implemented on Fuchsia, so use simple dot-file locking for now. */ - UNIXVFS("unix", dotlockIoFinder ), #else UNIXVFS("unix", posixIoFinder ), #endif |