diff options
author | Rebecca Turner <me@re-becca.org> | 2016-03-11 01:25:32 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2016-03-11 01:38:14 +0300 |
commit | 634ecba320fb5a3287e8b7debfd8b931827b9e19 (patch) | |
tree | 7c3d31029174ce3bdd831b6b909c59c8f9fc163b /node_modules/node-gyp | |
parent | be55882dc4ee5ce0777b4badc9141dab5bf5be4d (diff) |
node-gyp@3.3.1
Fix bug in builds for Android.
Credit: @bnoordhuis
Diffstat (limited to 'node_modules/node-gyp')
-rw-r--r-- | node_modules/node-gyp/gyp/pylib/gyp/generator/android.py | 4 | ||||
-rw-r--r-- | node_modules/node-gyp/package.json | 40 |
2 files changed, 22 insertions, 22 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/package.json b/node_modules/node-gyp/package.json index a0c748dbf..bbbc22ce9 100644 --- a/node_modules/node-gyp/package.json +++ b/node_modules/node-gyp/package.json @@ -1,23 +1,23 @@ { "_args": [ [ - "node-gyp@~3.3.0", + "node-gyp@3.3.1", "/Users/rebecca/code/npm" ] ], - "_from": "node-gyp@>=3.3.0 <3.4.0", - "_id": "node-gyp@3.3.0", + "_from": "node-gyp@3.3.1", + "_id": "node-gyp@3.3.1", "_inCache": true, "_installable": true, "_location": "/node-gyp", - "_nodeVersion": "5.3.0", + "_nodeVersion": "6.0.0-pre", "_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" }, "_npmUser": { - "email": "rod@vagg.org", - "name": "rvagg" + "email": "info@bnoordhuis.nl", + "name": "bnoordhuis" }, "_npmVersion": "3.3.12", "_phantomChildren": { @@ -27,19 +27,19 @@ }, "_requested": { "name": "node-gyp", - "raw": "node-gyp@~3.3.0", - "rawSpec": "~3.3.0", + "raw": "node-gyp@3.3.1", + "rawSpec": "3.3.1", "scope": null, - "spec": ">=3.3.0 <3.4.0", - "type": "range" + "spec": "3.3.1", + "type": "version" }, "_requiredBy": [ "/" ], - "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.0.tgz", - "_shasum": "7cc676b72d0be31dc977fb3c93539cab7adeff1e", + "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz", + "_shasum": "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0", "_shrinkwrap": null, - "_spec": "node-gyp@~3.3.0", + "_spec": "node-gyp@3.3.1", "_where": "/Users/rebecca/code/npm", "author": { "email": "nathan@tootallnate.net", @@ -74,14 +74,14 @@ }, "directories": {}, "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" }, "engines": { "node": ">= 0.8.0" }, - "gitHead": "7b10467b57dc632d358917decbeea94fd1172282", - "homepage": "https://github.com/nodejs/node-gyp", + "gitHead": "1dcf356ca7b658789447108b29a985c00ffcf0f5", + "homepage": "https://github.com/nodejs/node-gyp#readme", "installVersion": 9, "keywords": [ "native", @@ -131,5 +131,5 @@ "scripts": { "test": "tape test/test-*" }, - "version": "3.3.0" + "version": "3.3.1" } |