Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: third_party/sqlite/BUILD.gn

Issue 949043002: Add //third_party/sqlite to dirs_to_snapshot, remove net_sql.patch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/tools/roll/update_from_chromium.py ('k') | third_party/sqlite/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/BUILD.gn
diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
index 2cc12d2b6a3444cafc2caa8ac2bfc5aa628c6435..6f301ca7167145ba6daa1bab4b76936f024f6497 100644
--- a/third_party/sqlite/BUILD.gn
+++ b/third_party/sqlite/BUILD.gn
@@ -30,6 +30,8 @@ source_set("sqlite") {
"SQLITE_ENABLE_BROKEN_FTS2",
"SQLITE_ENABLE_FTS2",
"SQLITE_ENABLE_FTS3",
+ "SQLITE_DISABLE_FTS3_UNICODE",
+ "SQLITE_DISABLE_FTS4_DEFERRED",
"SQLITE_ENABLE_ICU",
"SQLITE_ENABLE_MEMORY_MANAGEMENT",
"SQLITE_SECURE_DELETE",
@@ -45,6 +47,15 @@ source_set("sqlite") {
"SQLITE_NO_SYNC",
]
}
+ if (is_posix) {
+ defines += [
+ # Allow xSleep() call on Unix to use usleep() rather than sleep(), so it
+ # will have microsecond precision. Should only affect contended databases
+ # via the busy callback. Browser profile databases are mostly exclusive,
+ # but renderer databases may allow for contention.
+ "HAVE_USLEEP=1",
+ ]
+ }
include_dirs = [
"amalgamation",
@@ -69,7 +80,6 @@ source_set("sqlite") {
libs = [ "CoreFoundation.framework" ]
} else if (is_android) {
defines += [
- "HAVE_USLEEP=1",
"SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576",
"SQLITE_DEFAULT_AUTOVACUUM=1",
"SQLITE_TEMP_STORE=3",
@@ -78,16 +88,6 @@ source_set("sqlite") {
]
}
- if (is_clang) {
- cflags += [
- # sqlite does `if (*a++ && *b++);` in a non-buggy way.
- "-Wno-empty-body",
-
- # sqlite has some `unsigned < 0` checks.
- "-Wno-tautological-compare",
- ]
- }
-
public_configs = [ ":sqlite_config" ]
deps = [
« no previous file with comments | « mojo/tools/roll/update_from_chromium.py ('k') | third_party/sqlite/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698