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

Move third_party/stb to flutter/third_party. #48845

Merged
merged 6 commits into from
Dec 11, 2023
Merged

Move third_party/stb to flutter/third_party. #48845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
878dd86
Move third_party/stb.
matanlurey Dec 8, 2023
ad9b5e4
Move secondary files.
matanlurey Dec 8, 2023
e2af52b
++
matanlurey Dec 8, 2023
27bdaae
Merge remote-tracking branch 'upstream/main' into engine-buildmoot-stb
matanlurey Dec 11, 2023
49bbea6
++
matanlurey Dec 11, 2023
cab0414
++
matanlurey Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ deps = {
'src/third_party/json':
Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',

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

'src/third_party/gradle': {
Expand Down
6 changes: 4 additions & 2 deletions build/secondary/third_party/stb/BUILD.gn → ...econdary/flutter/third_party/stb/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

source_root = "//third_party/stb"
source_root = "//flutter/third_party/stb"

source_set("stb_truetype") {
testonly = true
Expand All @@ -11,5 +11,7 @@ source_set("stb_truetype") {

include_dirs = [ "$source_root" ]

sources = [ "//flutter/build/secondary/third_party/stb/stb_truetype_stub.cc" ]
sources = [
"//flutter/build/secondary/flutter/third_party/stb/stb_truetype_stub.cc",
]
}
2 changes: 1 addition & 1 deletion ...dary/third_party/stb/stb_truetype_stub.cc → ...tter/third_party/stb/stb_truetype_stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
// found in the LICENSE file.

#define STB_TRUETYPE_IMPLEMENTATION
#include "third_party/stb/stb_truetype.h"
#include "flutter/third_party/stb/stb_truetype.h"
2 changes: 1 addition & 1 deletion ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,7 @@
../../../flutter/third_party/sqlite/Makefile
../../../flutter/third_party/sqlite/README.md
../../../flutter/third_party/sqlite/VERSION
../../../flutter/third_party/stb
../../../flutter/third_party/test_shaders
../../../flutter/third_party/tinygltf
../../../flutter/third_party/tonic/.clang-format
Expand Down Expand Up @@ -3020,7 +3021,6 @@
../../../third_party/root_certificates/certdata.pem
../../../third_party/root_certificates/certdata.txt
../../../third_party/root_certificates/codereview.settings
../../../third_party/stb
../../../third_party/swiftshader
../../../third_party/vulkan-deps/.git
../../../third_party/vulkan-deps/.gitattributes
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 5dbd06463802f22fb8c461c9bda734b8
Signature: 8063c36f273a2ca0d4db5f05f9d5991a

2 changes: 1 addition & 1 deletion impeller/typographer/backends/stb/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ impeller_component("typographer_stb_backend") {

public_deps = [
"//flutter/impeller/typographer",
"//third_party/stb:stb_truetype",
"//flutter/third_party/stb:stb_truetype",
]
}
2 changes: 1 addition & 1 deletion impeller/typographer/backends/stb/typeface_stb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include "flutter/fml/macros.h"
#include "flutter/fml/mapping.h"
#include "flutter/third_party/stb/stb_truetype.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that leaving the include path as is should hopefully still work. I'm a bit worried that the include rewriter that imports the source into the internal repo might be confused by this change.

#include "impeller/base/backend_cast.h"
#include "impeller/typographer/typeface.h"
#include "third_party/stb/stb_truetype.h"

namespace impeller {

Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/lib/paths.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/skia/third_party/lua', // not linked in
r'flutter/third_party/skia/third_party/vello', // not linked in
r'flutter/third_party/skia/tools', // contains nothing that ends up in the binary executable
r'flutter/third_party/stb',
r'flutter/third_party/test_shaders', // for tests only
r'flutter/third_party/tinygltf',
r'flutter/third_party/txt/third_party/fonts',
Expand Down Expand Up @@ -183,7 +184,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/protobuf', // build-time dependency only
r'third_party/root_certificates/certdata.pem',
r'third_party/root_certificates/certdata.txt',
r'third_party/stb',
r'third_party/swiftshader', // only used on hosts for tests
r'third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
r'third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
Expand Down