Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e9df434539745202fa5f9b729fe5f82e5de3f025',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '34b081632dcc446d121d97a102f8fac7ee4cb751',

'src/flutter/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
Expand Down Expand Up @@ -829,7 +829,7 @@ deps = {
'dep_type': 'cipd',
},

'src/buildtools/emsdk': {
'src/flutter/prebuilts/emsdk': {
'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'a896e3d066448b3530dbcaa48869fafefd738f57',
'condition': 'download_emsdk',
},
Expand Down Expand Up @@ -1055,7 +1055,7 @@ deps = {
'dep_type': 'cipd',
},

'src/third_party/google_fonts_for_unit_tests': {
'src/flutter/third_party/google_fonts_for_unit_tests': {
'packages': [
{
'package': 'flutter/flutter_font_fallbacks',
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -1541,6 +1541,7 @@
../../../flutter/third_party/glfw/src/CMakeLists.txt
../../../flutter/third_party/glfw/tests
../../../flutter/third_party/gn
../../../flutter/third_party/google_fonts_for_unit_tests
../../../flutter/third_party/googletest
../../../flutter/third_party/gtest-parallel/.git
../../../flutter/third_party/gtest-parallel/.gitignore
Expand Down Expand Up @@ -3130,7 +3131,6 @@
../../../third_party/dart/utils/OWNERS
../../../third_party/dart/utils/compiler/.gitignore
../../../third_party/dart/utils/dartanalyzer/.gitignore
../../../third_party/google_fonts_for_unit_tests
../../../third_party/gradle
../../../third_party/java
../../../third_party/libcxx/.clang-format
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 6d4a7215ee5679ace5ae272f414246bb
Signature: 2d5041d8bed2f11b22aad4b0e1fafc67

2 changes: 1 addition & 1 deletion lib/web_ui/dev/roll_fallback_fonts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
);
await runProcess('gclient', <String>[
'setdep',
'--revision=src/third_party/google_fonts_for_unit_tests:$packageName@$versionString',
'--revision=src/flutter/third_party/google_fonts_for_unit_tests:$packageName@$versionString',
'--deps-file=$depFilePath'
]);
}
Expand Down
1 change: 1 addition & 0 deletions lib/web_ui/dev/steps/copy_artifacts_step.dart
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class CopyArtifactsStep implements PipelineStep {

final io.Directory fallbackFontsSource = io.Directory(pathlib.join(
environment.engineSrcDir.path,
'flutter',
'third_party',
'google_fonts_for_unit_tests',
));
Expand Down
2 changes: 1 addition & 1 deletion tools/activate_emsdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import subprocess
import sys

EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'buildtools', 'emsdk'))
EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'prebuilts', 'emsdk'))

EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')

Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/glfw/deps', // Only used by examples and tests; not linked in build.
r'flutter/third_party/glfw/docs',
r'flutter/third_party/gn',
r'flutter/third_party/google_fonts_for_unit_tests', // only used in web unit tests
r'flutter/third_party/harfbuzz/docs',
r'flutter/third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary
r'flutter/third_party/icu/filters',
Expand Down Expand Up @@ -198,7 +199,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/dart/third_party/pkg_tested',
r'third_party/dart/third_party/requirejs', // only used by DDC
r'third_party/dart/tools', // not shipped in binary
r'third_party/google_fonts_for_unit_tests', // only used in web unit tests
r'third_party/gradle',
r'third_party/java', // only used for Android builds
r'third_party/libcxx/benchmarks',
Expand Down