Revert of [sqlite] Respect the gyp and gn component switch. (patchset #6 id:100001 of https://codereview.chromium.org/1306863006/ )

Reason for revert:
Suspected of breaking chromium.webkit Mac builders, see https://code.google.com/p/chromium/issues/detail?id=526208

Summary:

Incompatible library version: httpd requires version 9.0.0 or later, but libsqlite3.dylib provides version 0.0.0

/b/build/slave/WebKit_Mac10_6__dbg_/build/src/out/Debug/libsqlite3.dylib seems to be used instead of expected/intended /usr/lib/libsqlite3.dylib

Original issue's description:
> [sqlite] Respect the gyp and gn component switch.
>
> SQLITE_API is the existing mechanism SQLite provides, and is used in
> preference to inventing a new SQLITE_EXPORT symbol (like
> sql/sql_export.h and other examples).
>
> CoreServices.framework is necessary on OSX because of the Time Machine
> patch.
>
> Remove sql/proxy.{h,cc}, which was necessary to work around SQLite
> linking statically into both component shlibs and unit test executables.
>
> [Relanding https://codereview.chromium.org/1322463002/ ]
>
> BUG=489444
> TBR=michaeln@chromium.org, thakis@chromium.org, brettw@chromium.org
>
> Committed: https://crrev.com/f71db5c36625ff00feb8283028631303ae5caa7c
> Cr-Commit-Position: refs/heads/master@{#346536}

TBR=michaeln@chromium.org,thakis@chromium.org,brettw@chromium.org,shess@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=489444

Review URL: https://codereview.chromium.org/1325833003

Cr-Commit-Position: refs/heads/master@{#346615}

2 files changed, 4 insertions, 39 deletions

diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
index d9fef6e..ac14a2c 100644
--- a/third_party/sqlite/BUILD.gn
+++ b/third_party/sqlite/BUILD.gn
@@ -10,8 +10,6 @@ declare_args() {
 }
 
 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 @@ if (!use_system_sqlite) {
     }
   }
 
-  component("sqlite_build") {
-    visibility = [ ":*" ]
-
+  source_set("sqlite") {
     sources = [
       "amalgamation/sqlite3.c",
       "amalgamation/sqlite3.h",
@@ -56,13 +52,6 @@ if (!use_system_sqlite) {
       "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 (!use_system_sqlite) {
     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 @@ if (!use_system_sqlite) {
     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) {
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index f4b3175..61bfd9d 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -116,7 +116,7 @@
           ],
         }, { # !use_system_sqlite
           'product_name': 'sqlite3',
-          'type': '<(component)',
+          'type': 'static_library',
           'sources': [
             'amalgamation/sqlite3.h',
             'amalgamation/sqlite3.c',
@@ -148,15 +148,6 @@
             4244, 4267,
           ],
           'conditions': [
-            ['OS == "win" and component == "shared_library"', {
-              'defines': ['SQLITE_API=__declspec(dllexport)'],
-              'direct_dependent_settings': {
-                'defines': ['SQLITE_API=__declspec(dllimport)'],
-              },
-            }],
-            ['OS != "win" and component == "shared_library"', {
-              'defines': ['SQLITE_API=__attribute__((visibility("default")))'],
-            }],
             ['OS=="linux"', {
               'link_settings': {
                 'libraries': [
@@ -168,7 +159,6 @@
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
-                  '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
                 ],
               },
             }],