Make build system architecture agnostic to remove Android special case

12 files changed, 65 insertions, 57 deletions

diff --git a/gyp/android.gyp b/gyp/android.gyp
new file mode 100644
index 0000000000..0a09edb6cd
--- /dev/null
+++ b/gyp/android.gyp
@@ -0,0 +1,5 @@
+{
+  'includes': [
+    '../android/mapboxgl-app.gypi',
+  ],
+}
diff --git a/gyp/asset-fs.gypi b/gyp/asset-fs.gypi
index f7fbea1c78..e84fabb629 100644
--- a/gyp/asset-fs.gypi
+++ b/gyp/asset-fs.gypi
@@ -17,14 +17,14 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
+          '<@(libuv_cflags)',
           '<@(boost_cflags)',
         ],
         'ldflags': [
-          '<@(uv_ldflags)',
+          '<@(libuv_ldflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
+          '<@(libuv_static_libs)',
         ],
         'defines': [
           '-DMBGL_ASSET_FS'
diff --git a/gyp/asset-zip.gypi b/gyp/asset-zip.gypi
index 8a195649f3..e8854734e1 100644
--- a/gyp/asset-zip.gypi
+++ b/gyp/asset-zip.gypi
@@ -18,21 +18,21 @@
 
       'variables': {
         'cflags': [
-          '<@(uv_cflags)',
-          '<@(zip_cflags)',
+          '<@(libuv_cflags)',
+          '<@(libzip_cflags)',
         ],
         'cflags_cc': [
-          '<@(uv_cflags)',
-          '<@(zip_cflags)',
+          '<@(libuv_cflags)',
+          '<@(libzip_cflags)',
           '<@(boost_cflags)',
         ],
         'ldflags': [
-          '<@(uv_ldflags)',
-          '<@(zip_ldflags)',
+          '<@(libuv_ldflags)',
+          '<@(libzip_ldflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
-          '<@(zip_static_libs)',
+          '<@(libuv_static_libs)',
+          '<@(libzip_static_libs)',
         ],
         'defines': [
           '-DMBGL_ASSET_ZIP'
diff --git a/gyp/cache-sqlite.gypi b/gyp/cache-sqlite.gypi
index a9d21924c2..704dc490ea 100644
--- a/gyp/cache-sqlite.gypi
+++ b/gyp/cache-sqlite.gypi
@@ -19,17 +19,17 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
-          '<@(sqlite3_cflags)',
+          '<@(libuv_cflags)',
+          '<@(sqlite_cflags)',
         ],
         'ldflags': [
-          '<@(uv_ldflags)',
-          '<@(sqlite3_ldflags)',
+          '<@(libuv_ldflags)',
+          '<@(sqlite_ldflags)',
           '<@(zlib_ldflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
-          '<@(sqlite3_static_libs)',
+          '<@(libuv_static_libs)',
+          '<@(sqlite_static_libs)',
           '<@(zlib_static_libs)',
         ],
       },
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 246419371c..f9b361032e 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -28,21 +28,21 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
+          '<@(libuv_cflags)',
           '<@(opengl_cflags)',
           '<@(boost_cflags)',
         ],
         'cflags': [
-          '<@(uv_cflags)',
+          '<@(libuv_cflags)',
           '<@(opengl_cflags)',
           '-fPIC'
         ],
         'ldflags': [
-          '<@(uv_ldflags)',
+          '<@(libuv_ldflags)',
           '<@(opengl_ldflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
+          '<@(libuv_static_libs)',
         ],
       },
 
diff --git a/gyp/http-curl.gypi b/gyp/http-curl.gypi
index b7c5832359..7ae5b1b75f 100644
--- a/gyp/http-curl.gypi
+++ b/gyp/http-curl.gypi
@@ -17,17 +17,17 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
-          '<@(curl_cflags)',
+          '<@(libuv_cflags)',
+          '<@(libcurl_cflags)',
           '<@(boost_cflags)',
         ],
         'ldflags': [
-          '<@(uv_ldflags)',
-          '<@(curl_ldflags)',
+          '<@(libuv_ldflags)',
+          '<@(libcurl_ldflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
-          '<@(curl_static_libs)',
+          '<@(libuv_static_libs)',
+          '<@(libcurl_static_libs)',
         ],
         'defines': [
           '-DMBGL_HTTP_CURL'
@@ -38,9 +38,9 @@
         ['host == "android"', {
           'variables': {
             # Android uses libzip and openssl to set CURL's CA bundle.
-            'cflags_cc': [ '<@(zip_cflags)', '<@(openssl_cflags)' ],
-            'ldflags': [ '<@(zip_ldflags)', ],
-            'libraries': [ '<@(zip_static_libs)', ],
+            'cflags_cc': [ '<@(libzip_cflags)', '<@(openssl_cflags)' ],
+            'ldflags': [ '<@(libzip_ldflags)', ],
+            'libraries': [ '<@(libzip_static_libs)', ],
           },
         }],
         ['OS == "mac"', {
diff --git a/gyp/http-nsurl.gypi b/gyp/http-nsurl.gypi
index a64c8508e8..efd2c18a7d 100644
--- a/gyp/http-nsurl.gypi
+++ b/gyp/http-nsurl.gypi
@@ -17,14 +17,14 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
+          '<@(libuv_cflags)',
         ],
         'ldflags': [
           '-framework Foundation', # For NSURLRequest
-          '<@(uv_ldflags)',
+          '<@(libuv_ldflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
+          '<@(libuv_static_libs)',
         ],
         'defines': [
           '-DMBGL_HTTP_NSURL'
diff --git a/gyp/linux.gyp b/gyp/linux.gyp
index 0f7126934f..6cc168ba8d 100644
--- a/gyp/linux.gyp
+++ b/gyp/linux.gyp
@@ -1,7 +1,10 @@
 {
   'includes': [
     '../linux/mapboxgl-app.gypi',
-    '../test/test.gypi',
-    '../bin/render.gypi',
+  ],
+
+  'conditions': [
+    ['test', { 'includes': [ '../test/test.gypi' ] } ],
+    ['render', { 'includes': [ '../bin/render.gypi' ] } ],
   ],
 }
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index 7701393bb9..41a5733acb 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -22,23 +22,23 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(png_cflags)',
+          '<@(libpng_cflags)',
           '<@(jpeg_cflags)',
-          '<@(uv_cflags)',
-          '<@(nu_cflags)',
+          '<@(libuv_cflags)',
+          '<@(nunicode_cflags)',
           '<@(boost_cflags)',
         ],
         'ldflags': [
-          '<@(png_ldflags)',
+          '<@(libpng_ldflags)',
           '<@(jpeg_ldflags)',
-          '<@(uv_ldflags)',
-          '<@(nu_ldflags)',
+          '<@(libuv_ldflags)',
+          '<@(nunicode_ldflags)',
         ],
         'libraries': [
-          '<@(png_static_libs)',
+          '<@(libpng_static_libs)',
           '<@(jpeg_static_libs)',
-          '<@(uv_static_libs)',
-          '<@(nu_static_libs)',
+          '<@(libuv_static_libs)',
+          '<@(nunicode_static_libs)',
         ],
       },
 
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index 7baba06e5c..481e0b2bbd 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -65,11 +65,11 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
+          '<@(libuv_cflags)',
           '<@(boost_cflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
+          '<@(libuv_static_libs)',
         ],
         'ldflags': [
           '-framework CoreLocation',
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi
index 394433870d..f614b831e5 100644
--- a/gyp/platform-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -23,23 +23,23 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(png_cflags)',
+          '<@(libpng_cflags)',
           '<@(jpeg_cflags)',
-          '<@(uv_cflags)',
-          '<@(nu_cflags)',
+          '<@(libuv_cflags)',
+          '<@(nunicode_cflags)',
           '<@(boost_cflags)',
         ],
         'ldflags': [
-          '<@(png_ldflags)',
+          '<@(libpng_ldflags)',
           '<@(jpeg_ldflags)',
-          '<@(uv_ldflags)',
-          '<@(nu_ldflags)',
+          '<@(libuv_ldflags)',
+          '<@(nunicode_ldflags)',
         ],
         'libraries': [
-          '<@(png_static_libs)',
+          '<@(libpng_static_libs)',
           '<@(jpeg_static_libs)',
-          '<@(uv_static_libs)',
-          '<@(nu_static_libs)',
+          '<@(libuv_static_libs)',
+          '<@(nunicode_static_libs)',
         ],
       },
 
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index ae5194761c..af30019ee5 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -20,11 +20,11 @@
 
       'variables': {
         'cflags_cc': [
-          '<@(uv_cflags)',
+          '<@(libuv_cflags)',
           '<@(boost_cflags)',
         ],
         'libraries': [
-          '<@(uv_static_libs)',
+          '<@(libuv_static_libs)',
         ],
         'ldflags': [
           '-framework Foundation',