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

Unified Diff: third_party/sqlite/BUILD.gn

Issue 1324523004: Revert of [sqlite] Respect the gyp and gn component switch. (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
« no previous file with comments | « sql/sql.gyp ('k') | third_party/sqlite/sqlite.gyp » ('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 9745c5778724328ba4715f19472b7047b7ef932c..866c2449101283f3c98644074a7f009372f102b1 100644
--- a/third_party/sqlite/BUILD.gn
+++ b/third_party/sqlite/BUILD.gn
@@ -11,15 +11,10 @@
if (!use_system_sqlite) {
config("sqlite_config") {
- if (is_component_build && is_win) {
- defines += [
- "SQLITE_API=__declspec(dllimport)",
- ]
- }
include_dirs = [ "." ]
}
- component("sqlite") {
+ source_set("sqlite") {
sources = [
"amalgamation/sqlite3.c",
"amalgamation/sqlite3.h",
@@ -36,17 +31,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
@@ -101,7 +85,6 @@
libs = [ "dl" ]
} else if (is_mac || is_ios) {
libs = [ "CoreFoundation.framework" ]
- libs = [ "CoreServices.framework" ]
} else if (is_android) {
defines += [
"SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576",
« no previous file with comments | « sql/sql.gyp ('k') | third_party/sqlite/sqlite.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698