[core] Merge SQLiteCache into the platform library

OfflineFileSource will depend on SQLite too.

8 files changed, 36 insertions, 64 deletions

diff --git a/gyp/cache-sqlite.gypi b/gyp/cache-sqlite.gypi
deleted file mode 100644
index 54774a4f05..0000000000
--- a/gyp/cache-sqlite.gypi
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  'targets': [
-    { 'target_name': 'cache-sqlite',
-      'product_name': 'mbgl-cache-sqlite',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'hard_dependency': 1,
-
-      'sources': [
-        '../platform/default/sqlite_cache.cpp',
-        '../platform/default/sqlite3.hpp',
-        '../platform/default/sqlite3.cpp',
-      ],
-
-      'include_dirs': [
-        '../include',
-        '../src',
-      ],
-
-      'variables': {
-        'cflags_cc': [
-          '<@(sqlite_cflags)',
-        ],
-        'ldflags': [
-          '<@(sqlite_ldflags)',
-          '<@(zlib_ldflags)',
-        ],
-        'libraries': [
-          '<@(sqlite_static_libs)',
-          '<@(zlib_static_libs)',
-        ],
-      },
-
-      'conditions': [
-        ['OS == "mac"', {
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
-          },
-        }, {
-         'cflags_cc': [ '<@(cflags_cc)' ],
-        }],
-      ],
-
-      'link_settings': {
-        'conditions': [
-          ['OS == "mac"', {
-            'libraries': [ '<@(libraries)' ],
-            'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
-          }, {
-            'libraries': [ '<@(libraries)', '<@(ldflags)' ],
-          }]
-        ],
-      },
-
-      'direct_dependent_settings': {
-        'include_dirs': [ '../include' ],
-      },
-    },
-  ],
-}
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 01857aa562..069686fe8b 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -8,7 +8,6 @@
         'platform-<(platform_lib)',
         'http-<(http_lib)',
         'asset-<(asset_lib)',
-        'cache-<(cache_lib)',
         'headless-<(headless_lib)',
         'standalone',
       ],
diff --git a/gyp/mbgl.gyp b/gyp/mbgl.gyp
index c2c8d9c261..2a43afed8b 100644
--- a/gyp/mbgl.gyp
+++ b/gyp/mbgl.gyp
@@ -20,7 +20,6 @@
     ['http_lib == "android" and host == "android"', { 'includes': [ 'http-android.gypi' ] } ],
     ['asset_lib == "fs"', { 'includes': [ 'asset-fs.gypi' ] } ],
     ['asset_lib == "zip"', { 'includes': [ 'asset-zip.gypi' ] } ],
-    ['cache_lib == "sqlite"', { 'includes': [ 'cache-sqlite.gypi' ] } ],
 
     ['install_prefix != ""', { 'includes': ['install.gypi' ] } ],
   ],
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index 89f624657d..22558a237a 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -22,6 +22,9 @@
         '../platform/default/timer.cpp',
         '../platform/default/default_file_source.cpp',
         '../platform/default/online_file_source.cpp',
+        '../platform/default/sqlite_cache.cpp',
+        '../platform/default/sqlite3.hpp',
+        '../platform/default/sqlite3.cpp',
       ],
 
       'variables': {
@@ -32,18 +35,23 @@
           '<@(nunicode_cflags)',
           '<@(boost_cflags)',
           '<@(variant_cflags)',
+          '<@(sqlite_cflags)',
         ],
         'ldflags': [
           '<@(libpng_ldflags)',
           '<@(jpeg_ldflags)',
           '<@(libuv_ldflags)',
           '<@(nunicode_ldflags)',
+          '<@(sqlite_ldflags)',
+          '<@(zlib_ldflags)',
         ],
         'libraries': [
           '<@(libpng_static_libs)',
           '<@(jpeg_static_libs)',
           '<@(libuv_static_libs)',
           '<@(nunicode_static_libs)',
+          '<@(sqlite_static_libs)',
+          '<@(zlib_static_libs)',
         ],
       },
 
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index 4383efd947..a49f0c5e98 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -15,6 +15,9 @@
         '../platform/default/timer.cpp',
         '../platform/default/default_file_source.cpp',
         '../platform/default/online_file_source.cpp',
+        '../platform/default/sqlite_cache.cpp',
+        '../platform/default/sqlite3.hpp',
+        '../platform/default/sqlite3.cpp',
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/application_root.mm',
@@ -85,9 +88,13 @@
           '<@(libuv_cflags)',
           '<@(boost_cflags)',
           '<@(variant_cflags)',
+          '<@(sqlite_cflags)',
+          '<@(zlib_cflags)',
         ],
         'libraries': [
           '<@(libuv_static_libs)',
+          '<@(sqlite_static_libs)',
+          '<@(zlib_static_libs)',
         ],
         'ldflags': [
           '-framework CoreLocation',
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi
index a3ed71b04f..00595aa720 100644
--- a/gyp/platform-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -23,6 +23,9 @@
         '../platform/default/timer.cpp',
         '../platform/default/default_file_source.cpp',
         '../platform/default/online_file_source.cpp',
+        '../platform/default/sqlite_cache.cpp',
+        '../platform/default/sqlite3.hpp',
+        '../platform/default/sqlite3.cpp',
       ],
 
       'variables': {
@@ -32,18 +35,23 @@
           '<@(libuv_cflags)',
           '<@(nunicode_cflags)',
           '<@(boost_cflags)',
+          '<@(sqlite_cflags)',
         ],
         'ldflags': [
           '<@(libpng_ldflags)',
           '<@(jpeg_ldflags)',
           '<@(libuv_ldflags)',
           '<@(nunicode_ldflags)',
+          '<@(sqlite_ldflags)',
+          '<@(zlib_ldflags)',
         ],
         'libraries': [
           '<@(libpng_static_libs)',
           '<@(jpeg_static_libs)',
           '<@(libuv_static_libs)',
           '<@(nunicode_static_libs)',
+          '<@(sqlite_static_libs)',
+          '<@(zlib_static_libs)',
         ],
       },
 
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 9af1cbd77a..ed4abea68f 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -15,6 +15,9 @@
         '../platform/default/timer.cpp',
         '../platform/default/default_file_source.cpp',
         '../platform/default/online_file_source.cpp',
+        '../platform/default/sqlite_cache.cpp',
+        '../platform/default/sqlite3.hpp',
+        '../platform/default/sqlite3.cpp',
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/application_root.mm',
@@ -59,9 +62,16 @@
           '<@(libuv_cflags)',
           '<@(boost_cflags)',
           '<@(variant_cflags)',
+          '<@(sqlite_cflags)',
+          '<@(zlib_cflags)',
+        ],
+        'ldflags': [
+          '<@(zlib_ldflags)',
         ],
         'libraries': [
           '<@(libuv_static_libs)',
+          '<@(sqlite_static_libs)',
+          '<@(zlib_static_libs)',
           '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
           '$(SDKROOT)/System/Library/Frameworks/CoreLocation.framework',
           '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
@@ -85,6 +95,9 @@
 
       'link_settings': {
         'libraries': [ '<@(libraries)' ],
+        'xcode_settings': {
+          'OTHER_LDFLAGS': [ '<@(ldflags)' ],
+        },
       },
 
       'direct_dependent_settings': {
diff --git a/gyp/standalone.gypi b/gyp/standalone.gypi
index 7f222016cd..732682cdf2 100644
--- a/gyp/standalone.gypi
+++ b/gyp/standalone.gypi
@@ -9,7 +9,6 @@
         'platform-<(platform_lib)',
         'http-<(http_lib)',
         'asset-<(asset_lib)',
-        'cache-<(cache_lib)',
         'headless-<(headless_lib)',
       ],
     },
@@ -24,7 +23,6 @@
         'platform-<(platform_lib)',
         'http-<(http_lib)',
         'asset-<(asset_lib)',
-        'cache-<(cache_lib)',
         'headless-<(headless_lib)',
       ],
     },