From 9c5abc122176a9080f03754e88c0bab4c08a034b Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 27 Jan 2017 11:46:06 -0800
Subject: [PATCH] [build] Use style-spec from gl-js monorepo

---
 mapbox-gl-js                                    | 2 +-
 package.json                                    | 1 -
 platform/android/scripts/generate-style-code.js | 2 +-
 platform/darwin/scripts/generate-style-code.js  | 2 +-
 scripts/generate-style-code.js                  | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mapbox-gl-js b/mapbox-gl-js
index 2663093c9..b701148c2 160000
--- a/mapbox-gl-js
+++ b/mapbox-gl-js
@@ -1 +1 @@
-Subproject commit 2663093c9d7f0cba6235131fb9b9f30328a76603
+Subproject commit b701148c26bf54e713a6d2490a6b8605a11f6179
diff --git a/package.json b/package.json
index 5a9e159cc..c3452bcad 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "ejs": "^2.4.1",
     "express": "^4.11.1",
     "lodash": "^4.16.4",
-    "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653",
     "mkdirp": "^0.5.1",
     "node-cmake": "^1.2.1",
     "pixelmatch": "^4.0.2",
diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js
index 9c31d0cbb..634a4ce80 100644
--- a/platform/android/scripts/generate-style-code.js
+++ b/platform/android/scripts/generate-style-code.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const ejs = require('ejs');
-const spec = require('mapbox-gl-style-spec').latest;
+const spec = require('../../../mapbox-gl-js/js/style-spec').latest;
 const _ = require('lodash');
 
 require('../../../scripts/style-code');
diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js
index 4b0425007..a305367af 100644
--- a/platform/darwin/scripts/generate-style-code.js
+++ b/platform/darwin/scripts/generate-style-code.js
@@ -11,7 +11,7 @@ const cocoaConventions = require('./style-spec-cocoa-conventions-v8.json');
 const prefix = 'MGL';
 const suffix = 'StyleLayer';
 
-let spec = _.merge(require('mapbox-gl-style-spec').latest, require('./style-spec-overrides-v8.json'));
+let spec = _.merge(require('../../../mapbox-gl-js/js/style-spec').latest, require('./style-spec-overrides-v8.json'));
 
 ///
 // Temporarily IGNORE layers that are in the spec yet still not supported in mbgl core
diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js
index f2acb12a2..d090dff87 100644
--- a/scripts/generate-style-code.js
+++ b/scripts/generate-style-code.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const ejs = require('ejs');
-const spec = require('mapbox-gl-style-spec').latest;
+const spec = require('../mapbox-gl-js/js/style-spec').latest;
 const colorParser = require('csscolorparser');
 
 require('./style-code');