Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2442)

Unified Diff: scripts/slave/recipe_modules/v8/api.py

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/v8/__init__.py ('k') | scripts/slave/recipe_modules/v8/testing.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/v8/api.py
diff --git a/scripts/slave/recipe_modules/v8/api.py b/scripts/slave/recipe_modules/v8/api.py
index a0e2f8110eaa99f105cc0dd6a2dde6742f3b0433..8cce285f16124e839d2a59497e8413551101bf82 100644
--- a/scripts/slave/recipe_modules/v8/api.py
+++ b/scripts/slave/recipe_modules/v8/api.py
@@ -282,15 +282,15 @@ class V8Api(recipe_api.RecipeApi):
return build_environment
def setup_mips_toolchain(self):
- mips_dir = self.m.infra_paths['slave_build'].join(MIPS_DIR, 'bin')
+ mips_dir = self.m.path['slave_build'].join(MIPS_DIR, 'bin')
if not self.m.path.exists(mips_dir):
self.m.gsutil.download_url(
'gs://chromium-v8/%s' % MIPS_TOOLCHAIN,
- self.m.infra_paths['slave_build'],
+ self.m.path['slave_build'],
name='bootstrapping mips toolchain')
self.m.step('unzipping',
['tar', 'xf', MIPS_TOOLCHAIN],
- cwd=self.m.infra_paths['slave_build'])
+ cwd=self.m.path['slave_build'])
self.c.gyp_env.CC = self.m.path.join(mips_dir, 'mips-linux-gnu-gcc')
self.c.gyp_env.CXX = self.m.path.join(mips_dir, 'mips-linux-gnu-g++')
@@ -373,16 +373,16 @@ class V8Api(recipe_api.RecipeApi):
def dr_compile(self):
self.m.file.makedirs(
'Create Build Dir',
- self.m.infra_paths['slave_build'].join('dynamorio', 'build'))
+ self.m.path['slave_build'].join('dynamorio', 'build'))
self.m.step(
'Configure Release x64 DynamoRIO',
['cmake', '..', '-DDEBUG=OFF'],
- cwd=self.m.infra_paths['slave_build'].join('dynamorio', 'build'),
+ cwd=self.m.path['slave_build'].join('dynamorio', 'build'),
)
self.m.step(
'Compile Release x64 DynamoRIO',
['make', '-j5'],
- cwd=self.m.infra_paths['slave_build'].join('dynamorio', 'build'),
+ cwd=self.m.path['slave_build'].join('dynamorio', 'build'),
)
@property
@@ -911,7 +911,7 @@ class V8Api(recipe_api.RecipeApi):
full_args = self._with_extra_flags(full_args)
if self.run_dynamorio:
- drrun = self.m.infra_paths['slave_build'].join(
+ drrun = self.m.path['slave_build'].join(
'dynamorio', 'build', 'bin64', 'drrun')
full_args += [
'--command_prefix',
« no previous file with comments | « scripts/slave/recipe_modules/v8/__init__.py ('k') | scripts/slave/recipe_modules/v8/testing.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698