DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to mojo 5f74f421c1fa8fa691360294d9ada303ccf6de4b

Browse Source 
* Remove most of mojo/dart/embedder
  * Update roll.py to only import a subset of mojo/dart/embedder
* Add mojo/dart/observatory
* Update mojo_sdk_revision to get fixes to dart_pkg.py
This commit is contained in:
Jason Simmons 2015-10-21 12:54:43 -07:00
parent 7062f07150
commit 2dd3af73ce
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -19,7 +19,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'mojo_sdk_revision': '487fee0efc6b6792f26a62b39ac010696bbb18bb',
'mojo_sdk_revision': '8622a959b150022f5abfc84f7a4acd19eda0150b',
'mojo_devtools_revision': '49879d78ce4486e10c2214a101d9b2e82794b2f4',
'skia_revision': '0d39d37ddcfb3847795639eaef513f1112eba627',

4
engine/src/flutter/sky/tools/roll/patch.py
View File

@ -14,10 +14,6 @@ def patch_and_filter(dest_dir, relative_patches_dir):
lambda line: not "gyp_environment" in line)
utils.commit("filter gyp_environment out of build/landmines.py")
utils.filter_file("mojo/dart/embedder/BUILD.gn",
lambda line: not "tonic" in line)
utils.commit("filter tonic out of mojo/dart/embedder/BUILD.gn")
patch(dest_dir, relative_patches_dir)

19
engine/src/flutter/sky/tools/roll/roll.py
View File

@ -74,7 +74,8 @@ dirs_from_mojo = [
'mojo/application',
'mojo/common',
'mojo/converters',
'mojo/dart/embedder',
('mojo/dart/embedder', ['embedder.gni']),
'mojo/dart/observatory',
'mojo/data_pipe_utils',
'mojo/edk',
'mojo/environment',
@ -102,15 +103,25 @@ files_not_to_roll = [
def rev(source_dir, dest_dir, dirs_to_rev, name):
for d in dirs_to_rev:
for dir_to_rev in dirs_to_rev:
if type(dir_to_rev) is tuple:
d, file_subset = dir_to_rev
else:
d = dir_to_rev
file_subset = None
print "removing directory %s" % d
try:
system(["git", "rm", "-r", d], cwd=dest_dir)
except subprocess.CalledProcessError:
print "Could not remove %s" % d
print "cloning directory %s" % d
files = system(["git", "ls-files", d], cwd=source_dir)
for f in files.splitlines():
if file_subset is None:
files = system(["git", "ls-files", d], cwd=source_dir).splitlines()
else:
files = [os.path.join(d, f) for f in file_subset]
for f in files:
source_path = os.path.join(source_dir, f)
if not os.path.isfile(source_path):
continue