Skip to content

Commit

Permalink
Pull Mojo SDK in via deps instead of checked in files
Browse files Browse the repository at this point in the history
This means that //mojo/public is pulled in by gclient using the hash
specified in the DEPS file from the github.com/domokit/mojo_sdk mirror.
Each mojo_sdk commit corresponds to its originating
github.com/domokit/mojo commit and has the origin commit in the
message. Thus to find the mojo_sdk revision to use for a particular
mojo revision, grep through the commit log in the mojo_sdk repo for the
matching "Cr-Mirrored-Commit:" line.

If you need to back your local checkout to earlier than this commit
after running gclient, do 'rm -rf mojo/public && git reset --hard' to
get the locally checked in versions back.  Otherwise you'll get subtree
commits in mojo/public/... and have a bad time.
  • Loading branch information
jamesr committed Aug 21, 2015
1 parent 9c507ba commit 536d1af
Show file tree
Hide file tree
Showing 807 changed files with 6 additions and 85,930 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Thumbs.db
/buildtools/
/dart/
/dart-pub-cache/
/mojo/public/
/native_client/
/out/
/out_*/
Expand Down
5 changes: 5 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

vars = {
'chromium_git': 'https://chromium.googlesource.com',
'mojo_sdk_revision': '9a5f81a3d2a6d027677366edb5de3ae85f6dbf16',
'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99',
'dart_revision': '95c951ad190f156eb61b99203c2e4948211c44a7',
'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485',
Expand Down Expand Up @@ -53,6 +54,10 @@ deps = {
'/external/github.com/dart-lang/observatory_pub_packages' + '@' +
Var('dart_observatory_packages_revision'),

'src/mojo/public':
Var('chromium_git') + '/external/github.com/domokit/mojo_sdk' + '@' +
Var('mojo_sdk_revision'),

'src/third_party/skia':
Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'),

Expand Down
2 changes: 0 additions & 2 deletions mojo/public/.gitignore

This file was deleted.

66 changes: 0 additions & 66 deletions mojo/public/BUILD.gn

This file was deleted.

27 changes: 0 additions & 27 deletions mojo/public/LICENSE

This file was deleted.

43 changes: 0 additions & 43 deletions mojo/public/README.md

This file was deleted.

16 changes: 0 additions & 16 deletions mojo/public/build/config/BUILD.gn

This file was deleted.

16 changes: 0 additions & 16 deletions mojo/public/c/PRESUBMIT.py

This file was deleted.

45 changes: 0 additions & 45 deletions mojo/public/c/README.md

This file was deleted.

14 changes: 0 additions & 14 deletions mojo/public/c/environment/BUILD.gn

This file was deleted.

65 changes: 0 additions & 65 deletions mojo/public/c/environment/async_waiter.h

This file was deleted.

61 changes: 0 additions & 61 deletions mojo/public/c/environment/logger.h

This file was deleted.

Loading

0 comments on commit 536d1af

Please sign in to comment.