Sync up with domokit at 0e34ee926b140853b6d8ae4f317affc7caffe672
Change-Id: I743d3858d629cc9199c0da62cb026b36ad69a1d9
diff --git a/android b/android
index 3622e28..0ab193b 100644
--- a/android
+++ b/android
@@ -2,7 +2,7 @@
<!--- DO NOT EDIT BY HAND. This file is generated by deps_convert.py -->
<manifest>
<imports>
- <fileimport file="mojo"/>
+ <localimport file="mojo"/>
</imports>
<projects>
<project name="third_party_appurify-python_src"
@@ -37,6 +37,10 @@
remote="https://chromium.googlesource.com/external/github.com/kennethreitz/requests.git"
path="src/third_party/requests/src"
revision="f172b30356d821d180fa4ecfa3e71c7274a32de4"/>
+ <project name="third_party_pyelftools"
+ remote="https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+ path="src/third_party/pyelftools"
+ revision="19b3e610c86fcadb837d252c794cb5e8008826ae"/>
<!-- End of entries generated by deps_convert.py -->
</projects>
</manifest>
diff --git a/mojo b/mojo
index 3b53d86..bddfbe3 100644
--- a/mojo
+++ b/mojo
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<imports>
- <fileimport file="buildtools"/>
- <fileimport file="minimal"/>
+ <localimport file="buildtools"/>
+ <localimport file="minimal"/>
</imports>
<projects>
<!-- Mojo repositories -->
@@ -10,7 +10,7 @@
path="manifest"
githooks="manifest/git-hooks"
gerrithost="https://mojo-review.googlesource.com"
- remote="https://mojo.googlesource.com/mojo-manifest"/>
+ remote="https://mojo.googlesource.com/manifest"/>
<project name="mojo"
path="src"
githooks="manifest/git-hooks"
@@ -29,24 +29,29 @@
<project name="base"
path="src/base"
githooks="manifest/git-hooks"
- remote="https://chromium.googlesource.com/external/github.com/domokit/base"
- revision="82833117dada3473e590e2ecf1ba6250193e5f9d"/>
+ gerrithost="https://mojo-review.googlesource.com"
+ remote="https://mojo.googlesource.com/base"
+ revision="9e74307b276b2f9988005c0e97e85ee222586f79"/>
<project name="lesnet"
path="lesnet"
githooks="manifest/git-hooks"
gerrithost="https://mojo-review.googlesource.com"
remote="https://mojo.googlesource.com/lesnet"/>
+ <project name="gurl"
+ remote="https://mojo.googlesource.com/gurl"
+ path="src/url"
+ revision="718eee97ed6a4df41d14726eb2eddc871d9eaaa3"/>
<!-- End of Mojo repositories -->
<!-- Entries generated by deps_convert.py -->
<project name="dart_third_party_root_certificates"
remote="https://chromium.googlesource.com/external/github.com/dart-lang/root_certificates"
path="src/dart/third_party/root_certificates"
- revision="c3a41df63afacec62fcb8135196177e35fe72f71"/>
+ revision="aed07942ce98507d2be28cbd29e879525410c7fc"/>
<project name="dart"
remote="https://chromium.googlesource.com/external/github.com/dart-lang/sdk.git"
path="src/dart"
- revision="a3804f6fc8a9726ced99bfdf79691009d2415b45"/>
+ revision="ddf35f2d56fb335c72388b05bfdba9391116593b"/>
<project name="dart_third_party_observatory_pub_packages"
remote="https://chromium.googlesource.com/external/github.com/dart-lang/observatory_pub_packages"
path="src/dart/third_party/observatory_pub_packages"
@@ -54,7 +59,7 @@
<project name="third_party_skia"
remote="https://chromium.googlesource.com/skia.git"
path="src/third_party/skia"
- revision="db284c52e62e8d16708e2065495a3b693b238771"/>
+ revision="8cc209111876b7c78b5ec577c9221d8ed5e21024"/>
<project name="third_party_requests_src"
remote="https://chromium.googlesource.com/external/github.com/kennethreitz/requests.git"
path="src/third_party/requests/src"
@@ -62,7 +67,7 @@
<project name="testing_gmock"
remote="https://chromium.googlesource.com/external/googlemock.git"
path="src/testing/gmock"
- revision="29763965ab52f24565299976b936d1265cb6a271"/>
+ revision="0421b6f358139f02e102c9c332ce19a33faf75be"/>
<project name="third_party_mesa_src"
remote="https://chromium.googlesource.com/chromium/deps/mesa.git"
path="src/third_party/mesa/src"
@@ -95,7 +100,7 @@
<project name="buildtools"
remote="https://chromium.googlesource.com/chromium/buildtools.git"
path="src/buildtools"
- revision="222bd42ce39d1bd8f08fe089b066f49c469e1cdf"/>
+ revision="3780bc523aad1d68a5bd00e05c453a80b2ba0b35"/>
<project name="third_party_pdfium"
remote="https://pdfium.googlesource.com/pdfium.git"
path="src/third_party/pdfium"
@@ -108,7 +113,7 @@
<project name="testing_gtest"
remote="https://chromium.googlesource.com/external/googletest.git"
path="src/testing/gtest"
- revision="be1868139ffe0ccd0e8e3b37292b84c821d9c8ad"/>
+ revision="9855a87157778d39b95eccfb201a9dc90f6d61c6"/>
<project name="third_party_lss"
remote="https://chromium.googlesource.com/external/linux-syscall-support/lss.git"
path="src/third_party/lss"
@@ -118,9 +123,9 @@
path="src/third_party/icu"
revision="94e4b770ce2f6065d4261d29c32683a6099b9d93"/>
<project name="tonic"
- remote="https://chromium.googlesource.com/external/github.com/domokit/tonic"
+ remote="https://mojo.googlesource.com/tonic"
path="src/tonic"
- revision="7e6944c008443b7753388a904bdeaf3461f5d889"/>
+ revision="f7acabb8fa6c91124486a41194eac3cd421b70d0"/>
<project name="tools_grit"
remote="https://chromium.googlesource.com/external/grit-i18n.git"
path="src/tools/grit"
@@ -152,7 +157,11 @@
<project name="third_party_boringssl_src"
remote="https://boringssl.googlesource.com/boringssl.git"
path="src/third_party/boringssl/src"
- revision="642f1498d056dbba3e50ed5a232ab2f482626dec"/>
+ revision="2deb984187ce8f6c739c780e7fe95e859e93b3da"/>
+ <project name="third_party_glm"
+ remote="https://chromium.googlesource.com/external/github.com/g-truc/glm"
+ path="src/third_party/glm"
+ revision="93d09e0e93ca6fe3d9dc6398489a54a3f9cf76db"/>
<!-- End of entries generated by deps_convert.py -->
</projects>
</manifest>
