[build] Move Mapbox GL JS to /vendorupstream/tmpsantos-move_gl_js_to_vendor

We need it for style code generation and style tests, but it is
confusing to have it on the root of the tree.

16 files changed, 17 insertions, 16 deletions

diff --git a/.gitmodules b/.gitmodules
index cd6db33ae3..9040e8fbcf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "mapbox-gl-js"]
-	path = mapbox-gl-js
+	path = vendor/mapbox-gl-js
 	url = https://github.com/mapbox/mapbox-gl-js.git
 [submodule "platform/ios/vendor/mapbox-events-ios"]
 	path = platform/ios/vendor/mapbox-events-ios
diff --git a/expression-test/expression_test_parser.cpp b/expression-test/expression_test_parser.cpp
index 44f8bebf5e..5cc2610e63 100644
--- a/expression-test/expression_test_parser.cpp
+++ b/expression-test/expression_test_parser.cpp
@@ -321,7 +321,8 @@ std::tuple<filesystem::path, std::vector<filesystem::path>, bool, uint32_t> pars
         exit(2);
     }
 
-    filesystem::path rootPath {std::string(TEST_RUNNER_ROOT_PATH).append("/mapbox-gl-js/test/integration/expression-tests")};
+    filesystem::path rootPath{
+        std::string(TEST_RUNNER_ROOT_PATH).append("/vendor/mapbox-gl-js/test/integration/expression-tests")};
     if (!filesystem::exists(rootPath)) {
         Log::Error(Event::General, "Test path '%s' does not exist.", rootPath.string().c_str());
         exit(3);
diff --git a/metrics/FIXME-linux-asan-style.json b/metrics/FIXME-linux-asan-style.json
index 7c99b2784c..ec8ac16797 100644
--- a/metrics/FIXME-linux-asan-style.json
+++ b/metrics/FIXME-linux-asan-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/FIXME-linux-ubsan-style.json b/metrics/FIXME-linux-ubsan-style.json
index 7c99b2784c..ec8ac16797 100644
--- a/metrics/FIXME-linux-ubsan-style.json
+++ b/metrics/FIXME-linux-ubsan-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/android-render-test-runner-style.json b/metrics/android-render-test-runner-style.json
index efc42d7321..df812b817f 100644
--- a/metrics/android-render-test-runner-style.json
+++ b/metrics/android-render-test-runner-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all",
diff --git a/metrics/linux-clang8-release-style.json b/metrics/linux-clang8-release-style.json
index 93f530b681..5c158554bd 100644
--- a/metrics/linux-clang8-release-style.json
+++ b/metrics/linux-clang8-release-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/linux-gcc8-debug-coverage-style.json b/metrics/linux-gcc8-debug-coverage-style.json
index 7c99b2784c..ec8ac16797 100644
--- a/metrics/linux-gcc8-debug-coverage-style.json
+++ b/metrics/linux-gcc8-debug-coverage-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/linux-gcc8-release-style.json b/metrics/linux-gcc8-release-style.json
index 1ee499069f..8f1ca8faec 100644
--- a/metrics/linux-gcc8-release-style.json
+++ b/metrics/linux-gcc8-release-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/linux-tsan-style.json b/metrics/linux-tsan-style.json
index 7c99b2784c..ec8ac16797 100644
--- a/metrics/linux-tsan-style.json
+++ b/metrics/linux-tsan-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/macos-xcode11-debug-style.json b/metrics/macos-xcode11-debug-style.json
index 083f78450e..9e6963e8f1 100644
--- a/metrics/macos-xcode11-debug-style.json
+++ b/metrics/macos-xcode11-debug-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/metrics/macos-xcode11-release-style.json b/metrics/macos-xcode11-release-style.json
index 9d709dc95a..d57f5276f2 100644
--- a/metrics/macos-xcode11-release-style.json
+++ b/metrics/macos-xcode11-release-style.json
@@ -1,5 +1,5 @@
 {
-    "base_test_path": "../mapbox-gl-js/test/integration",
+    "base_test_path": "../vendor/mapbox-gl-js/test/integration",
     "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js
index 0461bd7458..9ffbaed89a 100755
--- a/scripts/generate-shaders.js
+++ b/scripts/generate-shaders.js
@@ -7,7 +7,7 @@ const outputPath = 'src/mbgl/programs';
 const zlib = require('zlib');
 const crypto = require('crypto');
 
-var shaders = require('../mapbox-gl-js/src/shaders');
+var shaders = require('../vendor/mapbox-gl-js/src/shaders');
 
 require('./style-code');
 
diff --git a/scripts/nitpick/submodule-pin.js b/scripts/nitpick/submodule-pin.js
index 7ca129e096..a7ea4f901a 100755
--- a/scripts/nitpick/submodule-pin.js
+++ b/scripts/nitpick/submodule-pin.js
@@ -3,8 +3,8 @@ const nitpick = require('.');
 const child_process = require('child_process');
 
 // Make sure that the mapbox-gl-js submodule pin is up to date
-const head = child_process.execSync('git -C mapbox-gl-js rev-parse HEAD').toString().trim();
-const revs = child_process.execSync(`git -C mapbox-gl-js branch -a --contains ${head}`).toString().split('\n');
+const head = child_process.execSync('git -C vendor/mapbox-gl-js rev-parse HEAD').toString().trim();
+const revs = child_process.execSync(`git -C vendor/mapbox-gl-js branch -a --contains ${head}`).toString().split('\n');
 
 if (revs.indexOf('  remotes/origin/master') >= 0) {
     nitpick.ok(`mapbox-gl-js submodule pin is merged to master`);
diff --git a/scripts/style-spec.js b/scripts/style-spec.js
index 8a9c9d4144..441ee3bde9 100644
--- a/scripts/style-spec.js
+++ b/scripts/style-spec.js
@@ -1 +1 @@
-var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8');
+var spec = module.exports = require('../vendor/mapbox-gl-js/src/style-spec/reference/v8');
diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp
index bffadf1668..9926241be9 100644
--- a/test/style/expression/expression.test.cpp
+++ b/test/style/expression/expression.test.cpp
@@ -17,7 +17,7 @@ using namespace mbgl::style;
 
 TEST(Expression, IsExpression) {
     rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> spec;
-    spec.Parse<0>(util::read_file("mapbox-gl-js/src/style-spec/reference/v8.json").c_str());
+    spec.Parse<0>(util::read_file("vendor/mapbox-gl-js/src/style-spec/reference/v8.json").c_str());
     ASSERT_FALSE(spec.HasParseError());
     ASSERT_TRUE(spec.IsObject() &&
                 spec.HasMember("expression_name") &&
diff --git a/mapbox-gl-js b/vendor/mapbox-gl-js
-Subproject c82a0b8c89bb964824996e25f54c31cfaf419e6
+Subproject c82a0b8c89bb964824996e25f54c31cfaf419e6