Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5c1f13e

Browse files
authored
Move third_party/stb to flutter/third_party. (#48845)
As part of eliminating the Flutter buildroot (flutter/flutter#67373), we are moving all third-party dependencies from `//third_party` to `//flutter/third_party`.
1 parent 6acecdf commit 5c1f13e

File tree

8 files changed

+11
-9
lines changed

8 files changed

+11
-9
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ deps = {
715715
'src/third_party/json':
716716
Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
717717

718-
'src/third_party/stb':
718+
'src/flutter/third_party/stb':
719719
Var('flutter_git') + '/third_party/stb.git' + '@' + '5736b15f7ea0ffb08dd38af21067c314d6a3aae9',
720720

721721
'src/third_party/gradle': {

build/secondary/third_party/stb/BUILD.gn renamed to build/secondary/flutter/third_party/stb/BUILD.gn

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
source_root = "//third_party/stb"
5+
source_root = "//flutter/third_party/stb"
66

77
source_set("stb_truetype") {
88
testonly = true
@@ -11,5 +11,7 @@ source_set("stb_truetype") {
1111

1212
include_dirs = [ "$source_root" ]
1313

14-
sources = [ "//flutter/build/secondary/third_party/stb/stb_truetype_stub.cc" ]
14+
sources = [
15+
"//flutter/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc",
16+
]
1517
}

build/secondary/third_party/stb/stb_truetype_stub.cc renamed to build/secondary/flutter/third_party/stb/stb_truetype_stub.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
// found in the LICENSE file.
44

55
#define STB_TRUETYPE_IMPLEMENTATION
6-
#include "third_party/stb/stb_truetype.h"
6+
#include "flutter/third_party/stb/stb_truetype.h"

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,7 @@
10431043
../../../flutter/third_party/sqlite/Makefile
10441044
../../../flutter/third_party/sqlite/README.md
10451045
../../../flutter/third_party/sqlite/VERSION
1046+
../../../flutter/third_party/stb
10461047
../../../flutter/third_party/test_shaders
10471048
../../../flutter/third_party/tinygltf
10481049
../../../flutter/third_party/tonic/.clang-format
@@ -3020,7 +3021,6 @@
30203021
../../../third_party/root_certificates/certdata.pem
30213022
../../../third_party/root_certificates/certdata.txt
30223023
../../../third_party/root_certificates/codereview.settings
3023-
../../../third_party/stb
30243024
../../../third_party/swiftshader
30253025
../../../third_party/vulkan-deps/.git
30263026
../../../third_party/vulkan-deps/.gitattributes

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: 5dbd06463802f22fb8c461c9bda734b8
1+
Signature: 8063c36f273a2ca0d4db5f05f9d5991a
22

impeller/typographer/backends/stb/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ impeller_component("typographer_stb_backend") {
2020

2121
public_deps = [
2222
"//flutter/impeller/typographer",
23-
"//third_party/stb:stb_truetype",
23+
"//flutter/third_party/stb:stb_truetype",
2424
]
2525
}

impeller/typographer/backends/stb/typeface_stb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#include "flutter/fml/macros.h"
88
#include "flutter/fml/mapping.h"
9+
#include "flutter/third_party/stb/stb_truetype.h"
910
#include "impeller/base/backend_cast.h"
1011
#include "impeller/typographer/typeface.h"
11-
#include "third_party/stb/stb_truetype.h"
1212

1313
namespace impeller {
1414

tools/licenses/lib/paths.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ final Set<String> skippedPaths = <String>{
9090
r'flutter/third_party/skia/third_party/lua', // not linked in
9191
r'flutter/third_party/skia/third_party/vello', // not linked in
9292
r'flutter/third_party/skia/tools', // contains nothing that ends up in the binary executable
93+
r'flutter/third_party/stb',
9394
r'flutter/third_party/test_shaders', // for tests only
9495
r'flutter/third_party/tinygltf',
9596
r'flutter/third_party/txt/third_party/fonts',
@@ -183,7 +184,6 @@ final Set<String> skippedPaths = <String>{
183184
r'third_party/protobuf', // build-time dependency only
184185
r'third_party/root_certificates/certdata.pem',
185186
r'third_party/root_certificates/certdata.txt',
186-
r'third_party/stb',
187187
r'third_party/swiftshader', // only used on hosts for tests
188188
r'third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
189189
r'third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files

0 commit comments

Comments
 (0)