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

Unified Diff: third_party/sqlite/BUILD.gn

Issue 1318823008: Un-nest configs in GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: third_party/sqlite/BUILD.gn
diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
index 866c2449101283f3c98644074a7f009372f102b1..d253173ad2ef4b1fb64ad2591bd0e7da9dcb7a95 100644
--- a/third_party/sqlite/BUILD.gn
+++ b/third_party/sqlite/BUILD.gn
@@ -14,6 +14,27 @@ if (!use_system_sqlite) {
include_dirs = [ "." ]
}
+ config("sqlite_warnings") {
+ cflags = []
+ if (is_clang) {
+ # sqlite contains a few functions that are unused, at least on
+ # Windows with Chromium's sqlite patches applied
+ # (interiorCursorEOF fts3EvalDeferredPhrase
+ # fts3EvalSelectDeferred sqlite3Fts3InitHashTable
+ # sqlite3Fts3InitTok).
+ cflags += [ "-Wno-unused-function" ]
+ }
+ if (is_linux) {
+ cflags += [
+ # SQLite doesn"t believe in compiler warnings,
+ # preferring testing.
+ # http://www.sqlite.org/faq.html#q17
+ "-Wno-int-to-pointer-cast",
+ "-Wno-pointer-to-int-cast",
+ ]
+ }
+ }
+
source_set("sqlite") {
sources = [
"amalgamation/sqlite3.c",
@@ -57,26 +78,6 @@ if (!use_system_sqlite) {
include_dirs = [ "amalgamation" ]
- config("sqlite_warnings") {
- cflags = []
- if (is_clang) {
- # sqlite contains a few functions that are unused, at least on
- # Windows with Chromium's sqlite patches applied
- # (interiorCursorEOF fts3EvalDeferredPhrase
- # fts3EvalSelectDeferred sqlite3Fts3InitHashTable
- # sqlite3Fts3InitTok).
- cflags += [ "-Wno-unused-function" ]
- }
- if (is_linux) {
- cflags += [
- # SQLite doesn"t believe in compiler warnings,
- # preferring testing.
- # http://www.sqlite.org/faq.html#q17
- "-Wno-int-to-pointer-cast",
- "-Wno-pointer-to-int-cast",
- ]
- }
- }
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":sqlite_warnings" ]

Powered by Google App Engine
This is Rietveld 408576698