Roll ANGLE to ToT

DEPS

@@ -110,7 +110,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '6669621484b649b9355fb2dd37950daf3d2ac65b',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd00ecf066669b2d6b3f9174de581864655bce6ff',
 
    # Fuchsia compatibility
    #
@@ -396,7 +396,7 @@ deps = {
    Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5d1e8540407c138f47028d64684f3da599430aa4',
 
    'src/third_party/angle':
-   Var('github_git') + '/google/angle.git' + '@' + '3ea90d609720b7b9b9d05ca094860382f2425294',
+   Var('github_git') + '/google/angle.git' + '@' + 'a56537a3d83d2eb4be6d1ae1ea074698850b1fa8',
 
   'src/third_party/pkg/when':
    Var('dart_git') + '/when.git' + '@' + '0.2.0',

ci/licenses_golden/tool_signature

@@ -1,2 +1,2 @@
-Signature: c182c713338fa4bfd82bfab82778038b
+Signature: c945496402c0b0e15ef05052f6619caa
 

tools/licenses/lib/licenses.dart

@@ -738,8 +738,18 @@ Iterable<_PartialLicenseMatch> _findLicenseBlocks(String body, RegExp pattern, i
       // examined closer.
       final _SplitLicense sanityCheck = _splitLicense(undecoratedCopyrights, verifyResults: false);
       final String conditions = sanityCheck.getConditions();
-      if (conditions != '')
-        throw 'potential license text caught in _findLicenseBlocks copyright dragnet:\n---\n$conditions\n---\nundecorated copyrights was:\n---\n$undecoratedCopyrights\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---';
+      if (conditions != '') {
+        // Copyright lines long enough to spill to a second line can create
+        // false positives; try to weed those out.
+        final String resplitCopyright = sanityCheck.getCopyright();
+        if (resplitCopyright.trim().contains('\n') ||
+            conditions.trim().contains('\n') ||
+            resplitCopyright.length < 70 ||
+            conditions.length > 15) {
+          throw 'potential license text caught in _findLicenseBlocks copyright dragnet:\n---\n$conditions\n---\nundecorated copyrights was:\n---\n$undecoratedCopyrights\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---';
+        }
+      }
+
       if (!copyrights.contains(copyrightMentionPattern))
         throw 'could not find copyright before license block:\n---\ncopyrights was:\n---\n$copyrights\n---\nblock was:\n---\n${body.substring(start, match.end)}\n---';
       if (body[match.start - 1] != '\n')

tools/licenses/lib/main.dart

@@ -1304,6 +1304,44 @@ class _RepositoryExcludeSubpathDirectory extends _RepositoryDirectory {
 
 // WHAT TO CRAWL AND WHAT NOT TO CRAWL
 
+class _RepositoryAngleDirectory extends _RepositoryDirectory {
+  _RepositoryAngleDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'src')
+      return _RepositoryAngleSrcDirectory(this, entry);
+    return super.createSubdirectory(entry);
+  }
+
+  @override
+  bool shouldRecurse(fs.IoNode entry) {
+    return entry.name != 'tools' // These are build-time tools, and aren't shipped.
+        && super.shouldRecurse(entry);
+  }
+}
+
+class _RepositoryAngleSrcDirectory extends _RepositoryDirectory {
+  _RepositoryAngleSrcDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'third_party')
+      return _RepositoryAngleSrcThirdPartyDirectory(this, entry);
+    return super.createSubdirectory(entry);
+  }
+}
+
+class _RepositoryAngleSrcThirdPartyDirectory extends _RepositoryDirectory {
+  _RepositoryAngleSrcThirdPartyDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  bool shouldRecurse(fs.IoNode entry) {
+    return entry.name != 'volk' // We don't use Vulkan in our ANGLE build.
+        && super.shouldRecurse(entry);
+  }
+}
+
 class _RepositoryAndroidPlatformDirectory extends _RepositoryDirectory {
   _RepositoryAndroidPlatformDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
@@ -1763,6 +1801,8 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
     if (entry.name == 'android_platform')
       return _RepositoryAndroidPlatformDirectory(this, entry);
+    if (entry.name == 'angle')
+      return _RepositoryAngleDirectory(this, entry);
     if (entry.name == 'boringssl')
       return _RepositoryBoringSSLDirectory(this, entry);
     if (entry.name == 'catapult')

tools/licenses/lib/patterns.dart

@@ -313,6 +313,23 @@ final List<LicenseFileReferencePattern> csReferencesByFilename = <LicenseFileRef
     )
   ),
 
+  // Chromium's zlib extensions.
+  LicenseFileReferencePattern(
+    firstPrefixIndex: 1,
+    indentPrefixIndex: 2,
+    copyrightIndex: 3,
+    authorIndex: 4,
+    fileIndex: 5,
+    pattern: RegExp(
+      kIndent +
+      r'(Copyright .+(The .+ Authors)\. +All rights reserved\. *\n)' +
+      r'\1\2Use of this source code is governed by a BSD-style license that can be *\n'
+      r'\1\2found in the Chromium source repository ([^ ]+) file.',
+      multiLine: true,
+      caseSensitive: false,
+    )
+  ),
+
   // Mojo code
   LicenseFileReferencePattern(
     firstPrefixIndex: 1,