Skip to content

Commit 5e65fa7

Browse files
matanlureysealesj
authored andcommitted
Move boringssl to flutter/third_party. (flutter#50601)
As ready as it's ever going to be.
1 parent d9b448a commit 5e65fa7

File tree

11 files changed

+5203
-5256
lines changed

11 files changed

+5203
-5256
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,13 @@ deps = {
315315
'src/third_party/googletest':
316316
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
317317

318-
'src/third_party/boringssl':
318+
'src/flutter/third_party/boringssl':
319319
Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
320320

321321
'src/flutter/third_party/yapf':
322322
Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',
323323

324-
'src/third_party/boringssl/src':
324+
'src/flutter/third_party/boringssl/src':
325325
'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
326326

327327
'src/third_party/perfetto':
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
group("boringssl") {
6+
public_deps = [ "//flutter/third_party/boringssl" ]
7+
}

build/secondary/third_party/libsrtp/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ if (use_system_libsrtp) {
155155
}
156156

157157
if (use_srtp_boringssl) {
158-
deps = [ "//third_party/boringssl:boringssl" ]
159-
public_deps = [ "//third_party/boringssl:boringssl" ]
158+
deps = [ "//flutter/third_party/boringssl:boringssl" ]
159+
public_deps = [ "//flutter/third_party/boringssl:boringssl" ]
160160
sources -= [
161161
"srtp/crypto/cipher/aes_cbc.c",
162162
"srtp/crypto/cipher/aes_icm.c",

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function verify_licenses() (
162162

163163
local actualLicenseCount
164164
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
165-
local expectedLicenseCount=114 # When changing this number: Update the error message below as well describing the newly expected license types.
165+
local expectedLicenseCount=197 # When changing this number: Update the error message below as well describing the newly expected license types.
166166

167167
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
168168
echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

Lines changed: 405 additions & 375 deletions
Large diffs are not rendered by default.

ci/licenses_golden/licenses_flutter

Lines changed: 4771 additions & 78 deletions
Large diffs are not rendered by default.

ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 4785 deletions
Large diffs are not rendered by default.

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 7cfe768e86f1799dbfcbc149e00e4bb4
1+
Signature: f823bf2a897af27f12f1c16a83c3e216
22

common/graphics/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ source_set("graphics") {
2727
"//flutter/shell/common:base64",
2828
"//flutter/shell/version:version",
2929
"//flutter/skia",
30+
"//flutter/third_party/boringssl",
3031
"//flutter/third_party/rapidjson",
31-
"//third_party/boringssl",
3232
]
3333

3434
public_configs = [ "//flutter:config" ]

tools/licenses/lib/main.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
990990
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);
991991

992992
static const Map<String, _Constructor> _specialCaseFiles = <String, _Constructor>{
993+
'/flutter/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
993994
'/flutter/third_party/inja/third_party/include/nlohmann/json.hpp': _RepositoryInjaJsonFile.new,
994995
'/flutter/third_party/libjpeg-turbo/src/LICENSE': _RepositoryLibJpegTurboLicenseFile.new,
995996
'/flutter/third_party/libjpeg-turbo/src/README.ijg': _RepositoryReadmeIjgFile.new,
@@ -998,7 +999,6 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
998999
'/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
9991000
'/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
10001001
'/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
1001-
'/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
10021002
'/third_party/dart/LICENSE': _RepositoryDartLicenseFile.new,
10031003
'/third_party/freetype2/LICENSE.TXT': _RepositoryFreetypeLicenseFile.new,
10041004
'/third_party/icu/LICENSE': _RepositoryIcuLicenseFile.new,
@@ -1440,9 +1440,6 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
14401440

14411441
@override
14421442
_RepositoryDirectory createSubdirectory(fs.Directory entry) {
1443-
if (entry.name == 'boringssl') {
1444-
return _RepositoryBoringSSLDirectory(this, entry);
1445-
}
14461443
if (entry.name == 'expat') {
14471444
return _RepositoryExpatDirectory(this, entry);
14481445
}
@@ -1762,6 +1759,9 @@ class _RepositoryFlutterThirdPartyDirectory extends _RepositoryGenericThirdParty
17621759

17631760
@override
17641761
_RepositoryDirectory createSubdirectory(fs.Directory entry) {
1762+
if (entry.name == 'boringssl') {
1763+
return _RepositoryBoringSSLDirectory(this, entry);
1764+
}
17651765
if (entry.name == 'expat') {
17661766
return _RepositoryExpatDirectory(this, entry);
17671767
}

0 commit comments

Comments
 (0)