GYP changes to get sql and sqlite building on iOS.

BUG=None
TEST=None


Review URL: https://chromiumcodereview.appspot.com/10696219

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148136 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 40 insertions, 26 deletions

diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index e129046..63aea03 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -34,42 +34,49 @@
                 ],
           },
         ],
-        ['OS=="linux" and not use_system_sqlite', {
-          'link_settings': {
-            'libraries': [
-              '-ldl',
-            ],
-          },
-        }],
         ['OS == "android"', {
           'defines': [
             'SQLITE_TEMP_STORE=3',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and use_system_sqlite', {
+        ['use_system_sqlite', {
           'type': 'none',
           'direct_dependent_settings': {
-            'cflags': [
-              # This next command produces no output but it it will fail (and
-              # cause GYP to fail) if we don't have a recent enough version of
-              # sqlite.
-              '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlite3)',
-
-              '<!@(pkg-config --cflags sqlite3)',
-            ],
             'defines': [
               'USE_SYSTEM_SQLITE',
             ],
           },
-          'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l sqlite3)',
-            ],
-          },
-        }, { # else: os_posix == 1 or OS == "mac" or ! use_system_sqlite
+
+          'conditions': [
+            ['OS == "ios"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/usr/lib/libsqlite3.dylib',
+                ],
+              },
+            }],
+            ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+              'direct_dependent_settings': {
+                'cflags': [
+                  # This next command produces no output but it it will fail
+                  # (and cause GYP to fail) if we don't have a recent enough
+                  # version of sqlite.
+                  '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlite3)',
+
+                  '<!@(pkg-config --cflags sqlite3)',
+                ],
+              },
+              'link_settings': {
+                'ldflags': [
+                  '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
+                ],
+                'libraries': [
+                  '<!@(pkg-config --libs-only-l sqlite3)',
+                ],
+              },
+            }],
+          ],
+        }, { # !use_system_sqlite
           'product_name': 'sqlite3',
           'type': 'static_library',
           'sources': [
@@ -114,6 +121,13 @@
             4018, 4244,
           ],
           'conditions': [
+            ['OS=="linux"', {
+              'link_settings': {
+                'libraries': [
+                  '-ldl',
+                ],
+              },
+            }],
             ['os_posix == 1 and OS != "mac"', {
               'cflags': [
                 # SQLite doesn't believe in compiler warnings,
@@ -143,7 +157,7 @@
     },
   ],
   'conditions': [
-    ['os_posix == 1 and OS != "mac" and not use_system_sqlite', {
+    ['os_posix == 1 and OS != "mac" and OS != "ios" and not use_system_sqlite', {
       'targets': [
         {
           'target_name': 'sqlite_shell',