Index: third_party/sqlite/BUILD.gn |
diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn |
index 9d41e3432b7322b32d9c5baa4cae1772a62fc72a..d253173ad2ef4b1fb64ad2591bd0e7da9dcb7a95 100644 |
--- a/third_party/sqlite/BUILD.gn |
+++ b/third_party/sqlite/BUILD.gn |
@@ -10,8 +10,6 @@ |
} |
if (!use_system_sqlite) { |
- # TODO(shess): This cannot possibly be the right thing to do. AFAICT it is |
- # only necessary so that WebDatabase can #include <sqlite3.h>. |
config("sqlite_config") { |
include_dirs = [ "." ] |
} |
@@ -37,9 +35,7 @@ |
} |
} |
- component("sqlite_build") { |
- visibility = [ ":*" ] |
- |
+ source_set("sqlite") { |
sources = [ |
"amalgamation/sqlite3.c", |
"amalgamation/sqlite3.h", |
@@ -56,13 +52,6 @@ |
"SQLITE_SEPARATE_CACHE_POOLS", |
"THREADSAFE", |
] |
- if (is_component_build) { |
- if (is_win) { |
- defines += [ "SQLITE_API=__declspec(dllexport)" ] |
- } else { |
- defines += [ "SQLITE_API=__attribute__((visibility(\"default\")))" ] |
- } |
- } |
if (is_chromeos) { |
defines += [ |
# Despite obvious warnings about not using this flag in deployment, we |
@@ -96,10 +85,7 @@ |
if (is_linux) { |
libs = [ "dl" ] |
} else if (is_mac || is_ios) { |
- libs = [ |
- "CoreFoundation.framework", |
- "CoreServices.framework", |
- ] |
+ libs = [ "CoreFoundation.framework" ] |
} else if (is_android) { |
defines += [ |
"SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576", |
@@ -113,19 +99,8 @@ |
deps = [ |
"//third_party/icu", |
] |
- } |
- config("sqlite_export") { |
- if (is_component_build && is_win) { |
- defines = [ "SQLITE_API=__declspec(dllimport)" ] |
- } |
- } |
- |
- # This is used to allow the SQLITE_API definition to be different when |
- # building sqlite3.c than it is when clients include sqlite3.h. |
- group("sqlite") { |
- public_deps = [ ":sqlite_build" ] |
- public_configs = [ ":sqlite_export", ":sqlite_config" ] |
+ public_configs = [ ":sqlite_config" ] |
} |
if (is_linux) { |