diff options
| author | Colin Cross <ccross@android.com> | 2022-03-08 20:48:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 20:48:51 +0000 |
| commit | e7c822c3f383eb87e89cf155ec08497c5e583e06 (patch) | |
| tree | ec5db4bdd9f461547ebedb711361062d6f9e5a85 | |
| parent | 396683ecf756459b986b23f922b0e66371d77b6a (diff) | |
| parent | d39faa7a940adf4b6b9cfeee07e0ed7ef48ba689 (diff) | |
| download | sqlite-e7c822c3f383eb87e89cf155ec08497c5e583e06.tar.gz | |
Merge "Revert "Update sqlite cflags"" am: 0a568fd586 am: d39faa7a94
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2016735
Change-Id: I371c93f45d7832d9c86b38b82e0699145d0dc00c
| -rw-r--r-- | dist/Android.bp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/dist/Android.bp b/dist/Android.bp index 77ee1e5..92b3bdf 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -50,7 +50,7 @@ cc_defaults { cflags: [ "-DNDEBUG=1", "-DHAVE_USLEEP=1", - "-DSQLITE_HAVE_ISNAN=1", + "-DSQLITE_HAVE_ISNAN", "-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576", "-DSQLITE_THREADSAFE=2", "-DSQLITE_TEMP_STORE=3", @@ -58,24 +58,29 @@ cc_defaults { "-DSQLITE_DEFAULT_FILE_FORMAT=4", "-DSQLITE_DEFAULT_AUTOVACUUM=1", "-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1", - "-DSQLITE_ENABLE_FTS3=1", - "-DSQLITE_ENABLE_FTS3_BACKWARDS=1", - "-DSQLITE_ENABLE_FTS4=1", - "-DSQLITE_OMIT_BUILTIN_TEST=1", - "-DSQLITE_OMIT_COMPILEOPTION_DIAGS=1", - "-DSQLITE_OMIT_LOAD_EXTENSION=1", + "-DSQLITE_ENABLE_FTS3", + "-DSQLITE_ENABLE_FTS3_BACKWARDS", + "-DSQLITE_ENABLE_FTS4", + "-DSQLITE_OMIT_BUILTIN_TEST", + "-DSQLITE_OMIT_COMPILEOPTION_DIAGS", + "-DSQLITE_OMIT_LOAD_EXTENSION", "-DSQLITE_DEFAULT_FILE_PERMISSIONS=0600", - "-DSQLITE_SECURE_DELETE=1", - "-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1", + "-DSQLITE_SECURE_DELETE", + "-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE", "-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD", - "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE=1", + "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE", "-Wno-unused-parameter", "-Werror", - "-DHAVE_POSIX_FALLOCATE=1", // Default value causes sqlite3_open_v2 to return error if DB is missing. "-ftrivial-auto-var-init=pattern", ], + + target: { + linux_glibc: { + cflags: ["-DHAVE_POSIX_FALLOCATE=1"], + }, + }, } cc_defaults { @@ -84,11 +89,11 @@ cc_defaults { target: { android: { cflags: [ - "-DUSE_PREAD64=1", + "-DUSE_PREAD64", "-Dfdatasync=fdatasync", "-DHAVE_MALLOC_H=1", "-DHAVE_MALLOC_USABLE_SIZE", - "-DSQLITE_ENABLE_DBSTAT_VTAB=1", + "-DSQLITE_ENABLE_DBSTAT_VTAB", ], }, }, @@ -112,7 +117,7 @@ cc_library { "liblog", "libandroidicu", ], - cflags: ["-DSQLITE_ENABLE_ICU=1"], + cflags: ["-DSQLITE_ENABLE_ICU"], // include android specific methods whole_static_libs: ["libsqlite3_android"], |