diff options
Diffstat (limited to 'tools/third_party.py')
| -rw-r--r-- | tools/third_party.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/third_party.py b/tools/third_party.py index 238cb67d7..0ba9dd37d 100644 --- a/tools/third_party.py +++ b/tools/third_party.py @@ -78,7 +78,13 @@ def google_env(env=None, merge_env=None, depot_tools_path_=depot_tools_path): # Run Yarn to install JavaScript dependencies. def run_yarn(): - run(["yarn", "install"], cwd=third_party_path) + node_modules_path = os.path.join(third_party_path, "node_modules") + # Note to keep the root directory clean, we keep package.json is in tools/. + run([ + "yarn", "install", "--no-lockfile", + "--modules-folder=" + node_modules_path + ], + cwd=os.path.join(root_path, "tools")) # Install python packages with pip. @@ -119,7 +125,7 @@ def run_pip(): rmtree(temp_python_home) -# Run gclient to install other dependencies. +# Run gclient to install V8. def run_gclient_sync(): # Depot_tools will normally try to self-update, which will fail because # it's not checked out from it's own git repository; gclient will then try @@ -151,7 +157,7 @@ def run_gclient_sync(): ] envs = { "DEPOT_TOOLS_UPDATE": "0", - "GCLIENT_FILE": os.path.join(root_path, "gclient_config.py") + "GCLIENT_FILE": os.path.join(root_path, "tools", "gclient_config.py") } env = google_env(depot_tools_path_=depot_tools_temp_path, merge_env=envs) run(args, cwd=third_party_path, env=env) |