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

Migrate perfetto to flutter/third_party #51272

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Migrate perfetto to flutter/third_party #51272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb66085
Migrate perfetto to flutter/third_party
cbracken Mar 7, 2024
a8a7cb3
Licences licences licences licences
cbracken Mar 12, 2024
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 @@ -333,7 +333,7 @@ deps = {
'src/flutter/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),

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

'src/flutter/third_party/protobuf':
Expand Down
2 changes: 2 additions & 0 deletions build_overrides/build.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ build_with_chromium = false
# targets to distinguish embedder builds from Perfetto standalone builds, and
# builds in the Android tree.
perfetto_build_with_embedder = true

perfetto_root_path = "//flutter/third_party/perfetto/"
2 changes: 1 addition & 1 deletion ci/licenses.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function verify_licenses() (

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

if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
echo "=============================== ERROR ==============================="
Expand Down
412 changes: 270 additions & 142 deletions ci/licenses_golden/excluded_files
View file
Open in desktop

Large diffs are not rendered by default.

1,867 changes: 1,866 additions & 1 deletion ci/licenses_golden/licenses_flutter
View file
Open in desktop

Large diffs are not rendered by default.

2,279 changes: 2 additions & 2,277 deletions ci/licenses_golden/licenses_third_party
View file
Open in desktop

Large diffs are not rendered by default.

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

20 changes: 10 additions & 10 deletions tools/licenses/lib/paths.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/libwebp/webp_js',
r'flutter/third_party/ninja', // build system
r'flutter/third_party/ocmock', // only used for tests
r'flutter/third_party/perfetto/debian', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/infra', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/protos', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/python/perfetto/trace_processor', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/src/ipc', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/src/profiling/memory', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/src/tools', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
r'flutter/third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
r'flutter/third_party/pkg/archive', // contains nothing that ends up in the binary executable
r'flutter/third_party/pkg/equatable',
r'flutter/third_party/pkg/flutter_packages',
Expand Down Expand Up @@ -207,16 +217,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/libcxx/utils',
r'third_party/libcxxabi/www',
r'third_party/libxml', // dependency of the testing system that we don't actually use
r'third_party/perfetto/debian', // contains nothing that ends up in the binary executable
r'third_party/perfetto/infra', // contains nothing that ends up in the binary executable
r'third_party/perfetto/protos', // contains nothing that ends up in the binary executable
r'third_party/perfetto/python/perfetto/trace_processor', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/ipc', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/profiling/memory', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/tools', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
r'third_party/zlib/contrib/minizip/minizip.c', // sample file
Expand Down