diff options
| author | Colin Cross <ccross@android.com> | 2022-03-08 19:21:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 19:21:15 +0000 |
| commit | 269e407bb0913b4c152c15376666133706bb9a24 (patch) | |
| tree | 66a44a1c221197226a75c4ab6a14edc71a4c6062 | |
| parent | d622f0c6f74bbc9a9b19cec22c084b55e3c50697 (diff) | |
| parent | aad32b9f2da327c3c91da9f6bf60d2e910d12b70 (diff) | |
| download | sqlite-269e407bb0913b4c152c15376666133706bb9a24.tar.gz | |
Merge "Update sqlite cflags" am: aad32b9f2d
Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2011682
Change-Id: I9d972bc6aecef8d74884a127fe7a2f398b1985a0
| -rw-r--r-- | dist/Android.bp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/dist/Android.bp b/dist/Android.bp index 92b3bdf..77ee1e5 100644 --- a/dist/Android.bp +++ b/dist/Android.bp @@ -50,7 +50,7 @@ cc_defaults { cflags: [ "-DNDEBUG=1", "-DHAVE_USLEEP=1", - "-DSQLITE_HAVE_ISNAN", + "-DSQLITE_HAVE_ISNAN=1", "-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576", "-DSQLITE_THREADSAFE=2", "-DSQLITE_TEMP_STORE=3", @@ -58,29 +58,24 @@ cc_defaults { "-DSQLITE_DEFAULT_FILE_FORMAT=4", "-DSQLITE_DEFAULT_AUTOVACUUM=1", "-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1", - "-DSQLITE_ENABLE_FTS3", - "-DSQLITE_ENABLE_FTS3_BACKWARDS", - "-DSQLITE_ENABLE_FTS4", - "-DSQLITE_OMIT_BUILTIN_TEST", - "-DSQLITE_OMIT_COMPILEOPTION_DIAGS", - "-DSQLITE_OMIT_LOAD_EXTENSION", + "-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_DEFAULT_FILE_PERMISSIONS=0600", - "-DSQLITE_SECURE_DELETE", - "-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE", + "-DSQLITE_SECURE_DELETE=1", + "-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1", "-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD", - "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE", + "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE=1", "-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 { @@ -89,11 +84,11 @@ cc_defaults { target: { android: { cflags: [ - "-DUSE_PREAD64", + "-DUSE_PREAD64=1", "-Dfdatasync=fdatasync", "-DHAVE_MALLOC_H=1", "-DHAVE_MALLOC_USABLE_SIZE", - "-DSQLITE_ENABLE_DBSTAT_VTAB", + "-DSQLITE_ENABLE_DBSTAT_VTAB=1", ], }, }, @@ -117,7 +112,7 @@ cc_library { "liblog", "libandroidicu", ], - cflags: ["-DSQLITE_ENABLE_ICU"], + cflags: ["-DSQLITE_ENABLE_ICU=1"], // include android specific methods whole_static_libs: ["libsqlite3_android"], |