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

Commit c076d21

Browse files
authored
Migrate perfetto to flutter/third_party (#51272)
Migrate perfetto from the buildroot's third_party directory to the engine's. Issue: flutter/flutter#144204 Part of: flutter/flutter#67373 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent af1fd17 commit c076d21

File tree

8 files changed

+2153
-2433
lines changed

8 files changed

+2153
-2433
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ deps = {
333333
'src/flutter/third_party/boringssl/src':
334334
'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
335335

336-
'src/third_party/perfetto':
336+
'src/flutter/third_party/perfetto':
337337
Var('flutter_git') + "/third_party/perfetto" + '@' + Var('dart_perfetto_rev'),
338338

339339
'src/flutter/third_party/protobuf':

build_overrides/build.gni

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ build_with_chromium = false
1111
# targets to distinguish embedder builds from Perfetto standalone builds, and
1212
# builds in the Android tree.
1313
perfetto_build_with_embedder = true
14+
15+
perfetto_root_path = "//flutter/third_party/perfetto/"

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function verify_licenses() (
170170

171171
local actualLicenseCount
172172
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
173-
local expectedLicenseCount=878 # When changing this number: Update the error message below as well describing the newly expected license types.
173+
local expectedLicenseCount=879 # When changing this number: Update the error message below as well describing the newly expected license types.
174174

175175
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
176176
echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

Lines changed: 270 additions & 142 deletions
Large diffs are not rendered by default.

ci/licenses_golden/licenses_flutter

Lines changed: 1866 additions & 1 deletion
Large diffs are not rendered by default.

ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 2277 deletions
Large diffs are not rendered by default.

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: 6d4a7215ee5679ace5ae272f414246bb
1+
Signature: 3c449c19152f3b271877be5efd19efa1
22

tools/licenses/lib/paths.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@ final Set<String> skippedPaths = <String>{
9393
r'flutter/third_party/libwebp/webp_js',
9494
r'flutter/third_party/ninja', // build system
9595
r'flutter/third_party/ocmock', // only used for tests
96+
r'flutter/third_party/perfetto/debian', // contains nothing that ends up in the binary executable
97+
r'flutter/third_party/perfetto/infra', // contains nothing that ends up in the binary executable
98+
r'flutter/third_party/perfetto/protos', // contains nothing that ends up in the binary executable
99+
r'flutter/third_party/perfetto/python/perfetto/trace_processor', // contains nothing that ends up in the binary executable
100+
r'flutter/third_party/perfetto/src/ipc', // contains nothing that ends up in the binary executable
101+
r'flutter/third_party/perfetto/src/profiling/memory', // contains nothing that ends up in the binary executable
102+
r'flutter/third_party/perfetto/src/tools', // contains nothing that ends up in the binary executable
103+
r'flutter/third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
104+
r'flutter/third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
105+
r'flutter/third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
96106
r'flutter/third_party/pkg/archive', // contains nothing that ends up in the binary executable
97107
r'flutter/third_party/pkg/equatable',
98108
r'flutter/third_party/pkg/flutter_packages',
@@ -207,16 +217,6 @@ final Set<String> skippedPaths = <String>{
207217
r'third_party/libcxx/utils',
208218
r'third_party/libcxxabi/www',
209219
r'third_party/libxml', // dependency of the testing system that we don't actually use
210-
r'third_party/perfetto/debian', // contains nothing that ends up in the binary executable
211-
r'third_party/perfetto/infra', // contains nothing that ends up in the binary executable
212-
r'third_party/perfetto/protos', // contains nothing that ends up in the binary executable
213-
r'third_party/perfetto/python/perfetto/trace_processor', // contains nothing that ends up in the binary executable
214-
r'third_party/perfetto/src/ipc', // contains nothing that ends up in the binary executable
215-
r'third_party/perfetto/src/profiling/memory', // contains nothing that ends up in the binary executable
216-
r'third_party/perfetto/src/tools', // contains nothing that ends up in the binary executable
217-
r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
218-
r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
219-
r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
220220
r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
221221
r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
222222
r'third_party/zlib/contrib/minizip/minizip.c', // sample file

0 commit comments

Comments
 (0)