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 all commits
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
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ deps = {
'src/flutter/third_party/stb':
Var('flutter_git') + '/third_party/stb.git' + '@' + '5736b15f7ea0ffb08dd38af21067c314d6a3aae9',

'src/third_party/gradle': {
'src/flutter/third_party/gradle': {
'packages': [
{
# See tools/gradle/README.md for update instructions.
Expand Down
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -1844,6 +1844,7 @@
../../../flutter/third_party/gn
../../../flutter/third_party/google_fonts_for_unit_tests
../../../flutter/third_party/googletest
../../../flutter/third_party/gradle
../../../flutter/third_party/gtest-parallel/.git
../../../flutter/third_party/gtest-parallel/.gitignore
../../../flutter/third_party/gtest-parallel/CONTRIBUTING.md
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_dart
Original file line number Diff line number Diff line change
Expand Up @@ -4741,7 +4741,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.

You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/fe75fa5f7dc0dca6ff2da32beffea62e444da869
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0380354e24483e4f23216d93879ca513b6443ba0
/third_party/fallback_root_certificates/

====================================================================================================
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: 73dfaba34f5ca20ba9bfcf0f19b74bd0
Signature: b3ce02b496b8b284656eb974794a7b65

2 changes: 1 addition & 1 deletion testing/rules/run_gradle.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

BAT = '.bat' if sys.platform.startswith(('cygwin', 'win')) else ''
GRADLE_BIN = os.path.normpath(
os.path.join(SCRIPT_PATH, '..', '..', '..', 'third_party', 'gradle', 'bin', 'gradle%s' % BAT)
os.path.join(SCRIPT_PATH, '..', '..', 'third_party', 'gradle', 'bin', 'gradle%s' % BAT)
)

ANDROID_HOME = os.path.normpath(
Expand Down
3 changes: 2 additions & 1 deletion testing/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,8 @@ def run_java_tests(executable_filter, android_variant='android_debug_unopt'):
BUILDROOT_DIR, 'flutter', 'shell', 'platform', 'android', 'test_runner'
)
gradle_bin = os.path.join(
BUILDROOT_DIR, 'third_party', 'gradle', 'bin', 'gradle.bat' if is_windows() else 'gradle'
BUILDROOT_DIR, 'flutter', 'third_party', 'gradle', 'bin',
'gradle.bat' if is_windows() else 'gradle'
)
flutter_jar = os.path.join(OUT_DIR, android_variant, 'flutter.jar')
android_home = os.path.join(BUILDROOT_DIR, 'flutter', 'third_party', 'android_tools', 'sdk')
Expand Down
2 changes: 1 addition & 1 deletion testing/scenario_app/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ update it, run:

```sh
cd testing/scenario_app/android
$ENGINE_SRC/third_party/gradle/bin/gradle app:dependencies --write-locks
$ENGINE_SRC/flutter/third_party/gradle/bin/gradle app:dependencies --write-locks
```

## Getting Help
Expand Down
2 changes: 1 addition & 1 deletion testing/scenario_app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ configureDependencies(new File(rootDir, '../../..')) { dependency ->

tasks.register('generateLockfiles') {
rootProject.subprojects.each { subproject ->
def gradle = "${rootProject.projectDir}/../../../../third_party/gradle/bin/gradle"
def gradle = "${rootProject.projectDir}/../../../third_party/gradle/bin/gradle"
rootProject.exec {
workingDir rootProject.projectDir
executable gradle
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 @@ -87,6 +87,7 @@ final Set<String> skippedPaths = <String>{
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/gradle',
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 @@ -220,7 +221,6 @@ final Set<String> skippedPaths = <String>{
r'out', // output of build
r'third_party/android_embedding_dependencies', // Not shipped. Used only for the build-time classpath, and for the in-tree testing framework for Android
r'third_party/android_tools', // excluded on advice
r'third_party/gradle',
r'third_party/java', // only used for Android builds
r'third_party/libxml', // dependency of the testing system that we don't actually use
r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
Expand Down