Skip to content

Commit 16fab7e

Browse files
auto-submit[bot]auto-submit[bot]
authored andcommitted
Reverts "Reland licenses cpp switch 3 (flutter#173063)" (flutter#173113)
<!-- start_original_pr_link --> Reverts: flutter#173063 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: gaaclarke <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: Again failing out because pkg-config is not present on the host machine. <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: gaaclarke <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {jtmcdole, jason-simmons} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: reland of flutter#173059 Unfortunately we don't have the ability to test the changes on the autoroller bots beforehand, so we have to resort to landing new attempts. ## changes since last revert - Removed usage of `et`. That was doing a `gn desc` call which forced GN to look for x11 for glfw which relies on `pkg-config` which doesn't exist on those machines. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 815dc4f commit 16fab7e

File tree

6 files changed

+66014
-33704
lines changed

6 files changed

+66014
-33704
lines changed

.autoroller-preupload.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

dev/bots/analyze.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2653,7 +2653,6 @@ Future<CommandResult> _runFlutterAnalyze(
26532653

26542654
// These files legitimately require executable permissions
26552655
const Set<String> kExecutableAllowlist = <String>{
2656-
'.autoroller-preupload.sh',
26572656
'bin/dart',
26582657
'bin/flutter',
26592658
'bin/flutter-dev',

engine/src/flutter/ci/builders/standalone/linux_license.json

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,11 @@
66
"cas_archive": false,
77
"name": "licenses",
88
"description": "Runs the license check script.",
9-
"gn": [
10-
"--target-dir",
11-
"ci/host_release_licenses",
12-
"--runtime-mode",
13-
"release",
14-
"--no-rbe",
15-
"--no-goma"
16-
],
17-
"ninja": {
18-
"config": "ci/host_release_licenses",
19-
"targets": [
20-
"flutter/tools/licenses_cpp",
21-
"flutter/tools/licenses_cpp:licenses_cpp_testrunner"
22-
]
23-
},
249
"tests": [
2510
{
26-
"name": "Run license_cpp unittests",
27-
"script": "out/ci/host_release_licenses/licenses_cpp_testrunner"
28-
},
29-
{
30-
"name": "Run license_cpp",
31-
"script": "flutter/ci/licenses_cpp.sh",
32-
"parameters": [
33-
"ci/host_release_licenses"
34-
]
11+
"name": "licenses check",
12+
"max_attempts": 1,
13+
"script": "flutter/ci/licenses.sh"
3514
}
3615
]
3716
}

engine/src/flutter/ci/licenses_cpp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ DATA_DIR="$SCRIPT_DIR/../tools/licenses_cpp/data"
6464
# in the directory where you *run* the script from (your current working directory).
6565
LICENSES_OUTPUT_PATH="$SCRIPT_DIR/../sky/packages/sky_engine/LICENSE_CPP.new"
6666

67-
LICENSES_PATH="$SCRIPT_DIR/../sky/packages/sky_engine/LICENSE"
67+
LICENSES_PATH="$SCRIPT_DIR/../sky/packages/sky_engine/LICENSE_CPP"
6868

6969
# --- Validation ---
7070

0 commit comments

Comments
 (0)