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

Unified Diff: tools-webrtc/mb/mb.py

Issue 2694423002: Revert of iOS: Use JSON for GN configuration instead of MB + remove symbols (Closed)
Patch Set: Created 3 years, 10 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 | « tools-webrtc/ios/tryserver.webrtc/ios_rel.json ('k') | tools-webrtc/mb/mb_config.pyl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools-webrtc/mb/mb.py
diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py
index dff9e293d18de433972fc6a85e4b47ff40724990..eb92f239f0c035586feae16caad3aad4ab4fb7f2 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools-webrtc/mb/mb.py
@@ -33,8 +33,8 @@
from collections import OrderedDict
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-SRC_DIR = os.path.dirname(os.path.dirname(SCRIPT_DIR))
-sys.path = [os.path.join(SRC_DIR, 'build')] + sys.path
+CHROMIUM_SRC_DIR = os.path.dirname(os.path.dirname(SCRIPT_DIR))
+sys.path = [os.path.join(CHROMIUM_SRC_DIR, 'build')] + sys.path
import gn_helpers
@@ -46,7 +46,7 @@
class MetaBuildWrapper(object):
def __init__(self):
- self.src_dir = SRC_DIR
+ self.chromium_src_dir = CHROMIUM_SRC_DIR
self.default_config = os.path.join(SCRIPT_DIR, 'mb_config.pyl')
self.default_isolate_map = os.path.join(SCRIPT_DIR, 'gn_isolate_map.pyl')
self.executable = sys.executable
@@ -619,7 +619,7 @@
def ReadIOSBotConfig(self):
if not self.args.master or not self.args.builder:
return {}
- path = self.PathJoin(self.src_dir, 'tools-webrtc', 'ios',
+ path = self.PathJoin(self.chromium_src_dir, 'ios', 'build', 'bots',
self.args.master, self.args.builder + '.json')
if not self.Exists(path):
return {}
@@ -921,7 +921,7 @@
'--isolate',
self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)),
],
- 'dir': self.src_dir,
+ 'dir': self.chromium_src_dir,
'version': 1,
},
isolate_path + 'd.gen.json',
@@ -966,7 +966,7 @@
else:
subdir, exe = 'win', 'gn.exe'
- gn_path = self.PathJoin(self.src_dir, 'buildtools', subdir, exe)
+ gn_path = self.PathJoin(self.chromium_src_dir, 'buildtools', subdir, exe)
return [gn_path, subcommand, path] + list(args)
@@ -1134,7 +1134,7 @@
return cmdline, extra_files
def ToAbsPath(self, build_path, *comps):
- return self.PathJoin(self.src_dir,
+ return self.PathJoin(self.chromium_src_dir,
self.ToSrcRelPath(build_path),
*comps)
@@ -1142,7 +1142,7 @@
"""Returns a relative path from the top of the repo."""
if path.startswith('//'):
return path[2:].replace('/', self.sep)
- return self.RelPath(path, self.src_dir)
+ return self.RelPath(path, self.chromium_src_dir)
def ParseGYPConfigPath(self, path):
rpath = self.ToSrcRelPath(path)
@@ -1430,12 +1430,12 @@
def Call(self, cmd, env=None, buffer_output=True):
if buffer_output:
- p = subprocess.Popen(cmd, shell=False, cwd=self.src_dir,
+ p = subprocess.Popen(cmd, shell=False, cwd=self.chromium_src_dir,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=env)
out, err = p.communicate()
else:
- p = subprocess.Popen(cmd, shell=False, cwd=self.src_dir,
+ p = subprocess.Popen(cmd, shell=False, cwd=self.chromium_src_dir,
env=env)
p.wait()
out = err = ''
« no previous file with comments | « tools-webrtc/ios/tryserver.webrtc/ios_rel.json ('k') | tools-webrtc/mb/mb_config.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698