node-gyp@3.3.1

Fixes Android generator

Credit: @bnoordhuis

7 files changed, 25 insertions, 21 deletions

diff --git a/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py b/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py
index ad6eff6d1..bb9eb5f4b 100644
--- a/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py
+++ b/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py
@@ -164,7 +164,7 @@ class AndroidMkWriter(object):
     if self.toolset == 'host':
       self.WriteLn('LOCAL_IS_HOST_MODULE := true')
       self.WriteLn('LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)')
-    else:
+    elif sdk_version > 0:
       self.WriteLn('LOCAL_MODULE_TARGET_ARCH := '
                    '$(TARGET_$(GYP_VAR_PREFIX)ARCH)')
       self.WriteLn('LOCAL_SDK_VERSION := %s' % sdk_version)
@@ -965,7 +965,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
   builddir_name = generator_flags.get('output_dir', 'out')
   limit_to_target_all = generator_flags.get('limit_to_target_all', False)
   write_alias_targets = generator_flags.get('write_alias_targets', True)
-  sdk_version = generator_flags.get('aosp_sdk_version', 19)
+  sdk_version = generator_flags.get('aosp_sdk_version', 0)
   android_top_dir = os.environ.get('ANDROID_BUILD_TOP')
   assert android_top_dir, '$ANDROID_BUILD_TOP not set; you need to run lunch.'
 
diff --git a/node_modules/node-gyp/node_modules/glob/package.json b/node_modules/node-gyp/node_modules/glob/package.json
index ad70fb110..434e4696f 100644
--- a/node_modules/node-gyp/node_modules/glob/package.json
+++ b/node_modules/node-gyp/node_modules/glob/package.json
@@ -67,5 +67,6 @@
     "tarball": "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json b/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
index b12c4a074..253335e62 100644
--- a/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
+++ b/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
@@ -43,5 +43,6 @@
     "tarball": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+  "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json b/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
index 6d7c5e104..2d403b6b2 100644
--- a/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
+++ b/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
@@ -55,5 +55,6 @@
     "tarball": "http://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"
+  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/node-gyp/node_modules/path-array/package.json b/node_modules/node-gyp/node_modules/path-array/package.json
index a96040656..974703c2e 100644
--- a/node_modules/node-gyp/node_modules/path-array/package.json
+++ b/node_modules/node-gyp/node_modules/path-array/package.json
@@ -52,5 +52,6 @@
     "tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"
+  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json
index 2c285300a..aedb6ce63 100644
--- a/node_modules/node-gyp/package.json
+++ b/node_modules/node-gyp/package.json
@@ -11,7 +11,7 @@
     "bindings",
     "gyp"
   ],
-  "version": "3.3.0",
+  "version": "3.3.1",
   "installVersion": 9,
   "author": {
     "name": "Nathan Rajlich",
@@ -52,19 +52,19 @@
   "scripts": {
     "test": "tape test/test-*"
   },
-  "gitHead": "7b10467b57dc632d358917decbeea94fd1172282",
+  "gitHead": "1dcf356ca7b658789447108b29a985c00ffcf0f5",
   "bugs": {
     "url": "https://github.com/nodejs/node-gyp/issues"
   },
-  "homepage": "https://github.com/nodejs/node-gyp",
-  "_id": "node-gyp@3.3.0",
-  "_shasum": "7cc676b72d0be31dc977fb3c93539cab7adeff1e",
-  "_from": "node-gyp@3.3.0",
+  "homepage": "https://github.com/nodejs/node-gyp#readme",
+  "_id": "node-gyp@3.3.1",
+  "_shasum": "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0",
+  "_from": "node-gyp@3.3.1",
   "_npmVersion": "3.3.12",
-  "_nodeVersion": "5.3.0",
+  "_nodeVersion": "6.0.0-pre",
   "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
+    "name": "bnoordhuis",
+    "email": "info@bnoordhuis.nl"
   },
   "maintainers": [
     {
@@ -93,13 +93,13 @@
     }
   ],
   "dist": {
-    "shasum": "7cc676b72d0be31dc977fb3c93539cab7adeff1e",
-    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.3.0.tgz"
+    "shasum": "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0",
+    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz"
   },
   "_npmOperationalInternal": {
-    "host": "packages-6-west.internal.npmjs.com",
-    "tmp": "tmp/node-gyp-3.3.0.tgz_1455598883163_0.7978834484238178"
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/node-gyp-3.3.1.tgz_1457115144174_0.4018901875242591"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.0.tgz"
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz"
 }
diff --git a/package.json b/package.json
index 0426a5087..b22db0631 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "lru-cache": "~3.2.0",
     "minimatch": "~3.0.0",
     "mkdirp": "~0.5.1",
-    "node-gyp": "~3.3.0",
+    "node-gyp": "~3.3.1",
     "nopt": "~3.0.6",
     "normalize-git-url": "~3.0.1",
     "normalize-package-data": "~2.3.5",