Merge remote-tracking branch 'upstream/master' into path_vol

Author: dnfield

DEPS

@@ -26,15 +26,15 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '2efafe688dd1d92d8a4bbbbd7c54aa3fcca17c6f',
+  'skia_revision': '0006ad01ce55228b43836a9320c419be6d6f0395',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '0618176527239705711d9868674f6535dda5796b',
+  'dart_revision': 'd189db64441cc801ee33f8e0acdb55b4308b0e10',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -43,22 +43,22 @@ vars = {
   'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce',
   'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3',
   'dart_collection_rev': 'e4bb038ce2d8e66fb15818aa40685c68d53692ab',
-  'dart_dart_style_tag': '1.3.9',
+  'dart_dart_style_tag': '1.3.10',
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.17.0-nullsafety',
   'dart_linter_tag': '0.1.125',
   'dart_oauth2_tag': '1.6.0',
-  'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
-  'dart_pub_rev': 'c00d4b4abf5b4ff265a7ce6282b748551f1b5b1f',
+  'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
+  'dart_pub_rev': '228e69e53862879c283c42b98086aa7536012a66',
   'dart_pub_semver_tag': 'v1.4.4',
   'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
   'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8',
   'dart_shelf_packages_handler_tag': '2.0.0',
   'dart_shelf_proxy_tag': '0.1.0+7',
   'dart_shelf_static_rev': 'a6168f162df88b0eef7e328629bf020122d5039e',
   'dart_shelf_web_socket_tag': '0.2.2+3',
-  'dart_sse_tag': '814924bac4d3cd56f40d05b3427e69f3e966d139',
+  'dart_sse_tag': '9a486d058a17e880afa9cc1c3c0dd8bad726bcbc',
   'dart_stack_trace_tag': '6788afc61875079b71b3d1c3e65aeaa6a25cbc2f',
   'dart_stagehand_tag': 'v3.3.11',
   'dart_stream_channel_tag': 'd7251e61253ec389ee6e045ee1042311bced8f1d',
@@ -104,7 +104,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '60b003915d131fb5d2b134742dd7b04e246f338d',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '4985b584a430ea3fda9433dccafa5047531e0974',
 
    # Fuchsia compatibility
    #
@@ -165,7 +165,7 @@ deps = {
    Var('dart_git') + '/async.git@695b3ac280f107c84adf7488743abfdfaaeea68f',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@26680d5e249b249c7216ab2fed0ac8ed4ee285c5',
+   Var('dart_git') + '/bazel_worker.git@060c55a933d39798681a4f533b161b81dc48d77e',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
    Var('dart_git') + '/boolean_selector.git@665e6921ab246569420376f827bff4585dff0b14',
@@ -192,10 +192,10 @@ deps = {
    Var('dart_git') + '/csslib.git@6f77b3dcee957d3e2d5083f666221a220e9ed1f1',
 
   'src/third_party/dart/third_party/pkg/dart2js_info':
-   Var('dart_git') + '/dart2js_info.git@0632a623b08e1f601c7eba99e0186a581ae799e9',
+   Var('dart_git') + '/dart2js_info.git@83504e459e13862cc6a61c147147ef7892a0d285',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@6935dcd8f2d78cf1797e6365b4b71505e6579659',
+   Var('dart_git') + '/dartdoc.git@d79877d0764ce23ffea7055049f8da5dffce0308',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@a5d4232cd38562c75a3ed847baa340e399538028',
@@ -336,7 +336,7 @@ deps = {
    Var('dart_git') + '/web_socket_channel.git@490061ef0e22d3c8460ad2802f9948219365ad6b',
 
   'src/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@925c406f8bdb06ce7935f0a7d03187b36c6b62d0',
+   Var('dart_git') + '/yaml.git@cca02c9e4f6826d62644901ed65c6d72b90a0713',
 
   'src/third_party/dart/third_party/pkg_tested/dart_style':
    Var('dart_git') + '/dart_style.git' + '@' + Var('dart_dart_style_tag'),
@@ -482,7 +482,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/embedding_bundle',
-        'version': 'last_updated:2020-05-20T01:36:16-0700'
+        'version': 'last_updated:2020-09-11T17:57:41-0700'
        }
      ],
      'condition': 'download_android_deps',
@@ -529,7 +529,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'DQpWjEN59czSM1GD_pokVbe8jIspvsAfHDyswvmPQS0C'
+        'version': 'OFI5mVERqS-Mta9ViIMzXDxqUKDCAGNTcV-ydJDWgP4C'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -549,7 +549,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'cwFOtNvhn7umwdXAG0LmDOH1L5NfIwJa_A2I6pTTbVgC'
+        'version': 'mw1Z23AQ4RKCxStXHhjxSKgg-Er0bBwOVClhGUKaFMMC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses.sh

@@ -33,6 +33,14 @@ SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
 DART_BIN="$SRC_DIR/third_party/dart/tools/sdks/dart-sdk/bin"
 PATH="$DART_BIN:$PATH"
 
+# Use:
+#   env VERBOSE=1 ./ci/licenses.sh
+# to turn on verbose progress report printing.
+QUIET="--quiet"
+if [[ "${VERBOSE}" == "1" ]]; then
+  QUIET=""
+fi
+
 echo "Verifying license script is still happy..."
 echo "Using pub from $(command -v pub), dart from $(command -v dart)"
 
@@ -58,7 +66,8 @@ function collect_licenses() (
   dart --enable-asserts lib/main.dart         \
     --src ../../..                            \
     --out ../../../out/license_script_output  \
-    --golden ../../ci/licenses_golden
+    --golden ../../ci/licenses_golden \
+    "${QUIET}"
 )
 
 # Verifies the licenses in the repo.
@@ -137,4 +146,4 @@ function verify_licenses() (
   return $exitStatus
 )
 
-verify_licenses
+verify_licenses

ci/licenses_golden/licenses_flutter

@@ -747,6 +747,8 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/Flutte
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dart/PlatformMessageHandler.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dynamicfeatures/DynamicFeatureManager.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/dynamicfeatures/PlayStoreDynamicFeatureManager.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
@@ -1054,8 +1056,6 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExter
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTextureGL.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.mm
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterOpenGLRenderer.h
-FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterOpenGLRenderer.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterSurfaceManager.h

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 304bb5c43f37a4b55de95d257d95064f
+Signature: 043565e22623b30e91d586f726358bc8
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 3d02ab0da612cc8b53f234f215dc692f
+Signature: 888e550716ec1f13143c9585af951d37
 
 UNUSED LICENSES:
 
@@ -5628,7 +5628,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLModifiersPool.h
 FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.cpp
 FILE: ../../../third_party/skia/src/sksl/SkSLRehydrator.h
 FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.cpp
-FILE: ../../../third_party/skia/src/sksl/ir/SkSLNodeArrayWrapper.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2020 Google LLC.