Move boringssl to flutter/third_party.

DEPS

@@ -315,13 +315,13 @@ deps = {
   'src/third_party/googletest':
    Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
 
-  'src/third_party/boringssl':
+  'src/flutter/third_party/boringssl':
    Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
 
   'src/flutter/third_party/yapf':
   Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',
 
-  'src/third_party/boringssl/src':
+  'src/flutter/third_party/boringssl/src':
    'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
   'src/third_party/perfetto':

build/secondary/third_party/boringssl/BUILD.gn

@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("boringssl") {
+  public_deps = [ "//flutter/third_party/boringssl" ]
+}

build/secondary/third_party/libsrtp/BUILD.gn

@@ -155,8 +155,8 @@ if (use_system_libsrtp) {
     }
 
     if (use_srtp_boringssl) {
-      deps = [ "//third_party/boringssl:boringssl" ]
-      public_deps = [ "//third_party/boringssl:boringssl" ]
+      deps = [ "//flutter/third_party/boringssl:boringssl" ]
+      public_deps = [ "//flutter/third_party/boringssl:boringssl" ]
       sources -= [
         "srtp/crypto/cipher/aes_cbc.c",
         "srtp/crypto/cipher/aes_icm.c",

ci/licenses.sh

@@ -162,7 +162,7 @@ function verify_licenses() (
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=114 # When changing this number: Update the error message below as well describing the newly expected license types.
+  local expectedLicenseCount=197 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
     echo "=============================== ERROR ==============================="

ci/licenses_golden/tool_signature

@@ -1,2 +1,2 @@
-Signature: 7cfe768e86f1799dbfcbc149e00e4bb4
+Signature: f823bf2a897af27f12f1c16a83c3e216
 

common/graphics/BUILD.gn

@@ -27,8 +27,8 @@ source_set("graphics") {
     "//flutter/shell/common:base64",
     "//flutter/shell/version:version",
     "//flutter/skia",
+    "//flutter/third_party/boringssl",
     "//flutter/third_party/rapidjson",
-    "//third_party/boringssl",
   ]
 
   public_configs = [ "//flutter:config" ]

tools/licenses/lib/main.dart

@@ -990,6 +990,7 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
   static final RegExp _licenseNamePattern = RegExp(r'^(?!.*\.py$)(?!.*(?:no|update)-copyright)(?!.*mh-bsd-gcc).*\b_*(?:license(?!\.html)|copying|copyright|notice|l?gpl|GPLv2|bsd|mit|mpl?|ftl|Apache)_*\b', caseSensitive: false);
 
   static const Map<String, _Constructor> _specialCaseFiles = <String, _Constructor>{
+    '/flutter/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
     '/flutter/third_party/inja/third_party/include/nlohmann/json.hpp': _RepositoryInjaJsonFile.new,
     '/flutter/third_party/libjpeg-turbo/src/LICENSE': _RepositoryLibJpegTurboLicenseFile.new,
     '/flutter/third_party/libjpeg-turbo/src/README.ijg': _RepositoryReadmeIjgFile.new,
@@ -998,7 +999,6 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
     '/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
     '/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
-    '/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
     '/third_party/dart/LICENSE': _RepositoryDartLicenseFile.new,
     '/third_party/freetype2/LICENSE.TXT': _RepositoryFreetypeLicenseFile.new,
     '/third_party/icu/LICENSE': _RepositoryIcuLicenseFile.new,
@@ -1440,9 +1440,6 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
-    if (entry.name == 'boringssl') {
-      return _RepositoryBoringSSLDirectory(this, entry);
-    }
     if (entry.name == 'expat') {
       return _RepositoryExpatDirectory(this, entry);
     }
@@ -1762,6 +1759,9 @@ class _RepositoryFlutterThirdPartyDirectory extends _RepositoryGenericThirdParty
 
   @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'boringssl') {
+      return _RepositoryBoringSSLDirectory(this, entry);
+    }
     if (entry.name == 'expat') {
       return _RepositoryExpatDirectory(this, entry);
     }

tools/licenses/lib/paths.dart

@@ -30,6 +30,10 @@ final Set<String> skippedPaths = <String>{
   r'flutter/prebuilts',
   r'flutter/sky/packages/sky_engine/LICENSE',
   r'flutter/third_party/benchmark', // only used by tests
+  r'flutter/third_party/boringssl/src/crypto/err/err_data_generate.go',
+  r'flutter/third_party/boringssl/src/fuzz', // testing tools, not shipped
+  r'flutter/third_party/boringssl/src/rust', // rust-related code is not shipped
+  r'flutter/third_party/boringssl/src/util', // code generators, not shipped
   r'flutter/third_party/depot_tools', // only used for the Windows build system.
   r'flutter/third_party/expat/expat/doc',
   r'flutter/third_party/expat/expat/win32/expat.iss',
@@ -130,10 +134,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/angle/third_party', // Unused by Flutter: BUILD files with forwarding targets (but no code).
   r'third_party/angle/tools', // These are build-time tools, and aren't shipped.
   r'third_party/angle/util',
-  r'third_party/boringssl/src/crypto/err/err_data_generate.go',
-  r'third_party/boringssl/src/fuzz', // testing tools, not shipped
-  r'third_party/boringssl/src/rust', // rust-related code is not shipped
-  r'third_party/boringssl/src/util', // code generators, not shipped
   r'third_party/dart/benchmarks', // not shipped in binary
   r'third_party/dart/build', // not shipped in binary
   r'third_party/dart/docs', // not shipped in binary
@@ -459,11 +459,11 @@ final List<Pattern> skippedFilePatterns = <Pattern>[
   RegExp(r'^flutter/(?:.+/)*[^/]+_unittests?\.[^/]+$'),
   RegExp(r'^flutter/lib/web_ui/lib/assets/ahem\.ttf$', expectNoMatch: true), // this gitignored file exists only for testing purposes
   RegExp(r'^flutter/sky/packages/sky_engine/LICENSE$'), // that is the output of this script
+  RegExp(r'^flutter/third_party/boringssl/(?:.+/)*[^/]+_test\.[^/]+$'),
+  RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/bn/[^/]+.go$'),
+  RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/ec/[^/]+.go$'),
   RegExp(r'^third_party/abseil-cpp/(?:.+/)*[^/]+_test\.[^/]+$'),
   RegExp(r'^third_party/angle/(?:.+/)*[^/]+_unittest\.[^/]+$'),
-  RegExp(r'^third_party/boringssl/(?:.+/)*[^/]+_test\.[^/]+$'),
-  RegExp(r'^third_party/boringssl/src/crypto/fipsmodule/bn/[^/]+.go$'),
-  RegExp(r'^third_party/boringssl/src/crypto/fipsmodule/ec/[^/]+.go$'),
   RegExp(r'^third_party/dart/(?:.+/)*[^/]+_test\.[^/]+$'),
   RegExp(r'^third_party/freetype2/docs/(?!FTL\.TXT$).+'), // ignore all documentation except the license
   RegExp(r'^third_party/zlib/(?:.+/)*[^/]+_unittest\.[^/]+$'),