Roll Global Integration
GitOrigin-RevId: 3845aafdcc812d291cca6423105fc6723ec6d2ec
Change-Id: Ibd04c2a0cf6316139675bad7d4c7bc4c69001b3a
diff --git a/jiri.lock b/jiri.lock
index 8a57891..8cf0d4b 100644
--- a/jiri.lock
+++ b/jiri.lock
@@ -71,13 +71,13 @@
},
{
"package": "fuchsia/dart-sdk/linux-amd64",
- "version": "git_revision:a3b579d5c32f726dcee552d8331a593ebc84812a",
- "instance_id": "2dXntgXUoE9KVTkVJTa_VrbHkFBA9sPeLcUftlqc71IC"
+ "version": "git_revision:2a3b844b41e220e99870747f53ea4016169e7178",
+ "instance_id": "oiM9yBSz2Iy3DcIDDhOOXhcBU5ueO8JRDpnGza_RIEkC"
},
{
"package": "fuchsia/dart-sdk/mac-amd64",
- "version": "git_revision:a3b579d5c32f726dcee552d8331a593ebc84812a",
- "instance_id": "h7YKMASACmYOPGUC4qj7nU9uC5ncIQOUGXdMOKXKR0gC"
+ "version": "git_revision:2a3b844b41e220e99870747f53ea4016169e7178",
+ "instance_id": "h6NyNqW4weXDlIlQIjFVcOomJv_VqERIkFWw0LfS96YC"
},
{
"package": "fuchsia/firmware/wlan/intel/iwlwifi",
diff --git a/prebuilts b/prebuilts
index 528bd28..332aac2 100644
--- a/prebuilts
+++ b/prebuilts
@@ -172,12 +172,12 @@
<!-- Packages for build -->
<!-- Dart -->
<package name="fuchsia/dart-sdk/${platform}"
- version="git_revision:a3b579d5c32f726dcee552d8331a593ebc84812a"
+ version="git_revision:2a3b844b41e220e99870747f53ea4016169e7178"
path="prebuilt/third_party/dart/{{.OS}}-{{.Arch}}"/>
<!-- Dart TODO: haowei remove this once all dart related projects no
longer depends on "topaz/tools/prebuilt-dart-sdk/" -->
<package name="fuchsia/dart-sdk/${platform}"
- version="git_revision:a3b579d5c32f726dcee552d8331a593ebc84812a"
+ version="git_revision:2a3b844b41e220e99870747f53ea4016169e7178"
path="topaz/tools/prebuilt-dart-sdk/{{.OS}}-{{.Arch}}"/>
<!-- Packages for Garnet -->
diff --git a/topaz/dart b/topaz/dart
index a9c75e2..72ea8f7 100644
--- a/topaz/dart
+++ b/topaz/dart
@@ -14,7 +14,7 @@
path="third_party/dart"
remote="https://dart.googlesource.com/sdk"
gerrithost="https://dart-review.googlesource.com"
- revision="a3b579d5c32f726dcee552d8331a593ebc84812a"
+ revision="2a3b844b41e220e99870747f53ea4016169e7178"
flag="third_party/dart/build/config/gclient_args.gni|checkout_llvm = false|checkout_llvm = false"/>
<project name="dart/observatory_pub_packages"
path="third_party/dart/third_party/observatory_pub_packages"
@@ -26,6 +26,6 @@
path="third_party/dart-pkg/pub"
remote="https://fuchsia.googlesource.com/third_party/dart-pkg"
gerrithost="https://fuchsia-review.googlesource.com"
- revision="dd383f0b03994550b2553554296cfb5cd1c449e6"/>
+ revision="db317b5f856b855f9a837662870b69778a4c5102"/>
</projects>
</manifest>
diff --git a/topaz/flutter b/topaz/flutter
index e85aaa7..6a2bba1 100644
--- a/topaz/flutter
+++ b/topaz/flutter
@@ -4,10 +4,10 @@
<project name="external/github.com/flutter/flutter"
path="third_party/dart-pkg/git/flutter"
remote="https://chromium.googlesource.com/external/github.com/flutter/flutter"
- revision="50b550229f77a4d117a6ffa45a6249f25023552a"/>
+ revision="7cb83c15d1243aedc412ee4dae57d875804bd146"/>
<project name="external/github.com/flutter/engine"
path="third_party/flutter"
remote="https://chromium.googlesource.com/external/github.com/flutter/engine"
- revision="e5f9132b347c20e08605802bc91971862e189aef"/>
+ revision="4d5c38e215e9350c33d4b5448364680a9ef8386b"/>
</projects>
</manifest>
diff --git a/topaz/skia b/topaz/skia
index 71e6408..f6ab1fa 100644
--- a/topaz/skia
+++ b/topaz/skia
@@ -4,6 +4,6 @@
<project name="external/skia.googlesource.com/skia"
path="third_party/skia"
remote="https://skia.googlesource.com/skia"
- revision="df54f37a5dc137258b3ce375d72d1ade8792b999"/>
+ revision="237a95fe7b28ea2629808885c056db51580902fb"/>
</projects>
</manifest>
