Skip to content

Commit d732cdb

Browse files
Merge branch 'main' into dev/runpinglai/deepidle
2 parents a642bf5 + 5dba463 commit d732cdb

331 files changed

Lines changed: 19049 additions & 5969 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pr-branch-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ on:
2424
branches:
2525
- dev/**/*
2626

27+
permissions: {}
28+
2729
jobs:
2830
pr-branch-check:
2931
if: startsWith(github.base_ref, 'dev/')

Android.bp

Lines changed: 705 additions & 130 deletions
Large diffs are not rendered by default.

Android.bp.extras

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ gensrcs {
228228
"perfetto.protos.ActivityInfoProto,perfetto.protos.ActivityRecordProto,perfetto.protos.AlphaAnimationSpecProto,perfetto.protos.AnimationAdapterProto,perfetto.protos.AnimationSpecProto,perfetto.protos.AppTransitionProto,perfetto.protos.BackNavigationProto,perfetto.protos.ConfigurationContainerProto,perfetto.protos.ConfigurationProto,perfetto.protos.DeviceConfigurationProto,perfetto.protos.DisplayAreaProto,perfetto.protos.DisplayContentProto,perfetto.protos.DisplayInfoProto,perfetto.protos.DisplayRotationProto,perfetto.protos.GlobalConfigurationProto,perfetto.protos.IdentifierProto,perfetto.protos.ImeInsetsSourceProviderProto,perfetto.protos.InsetsSourceProviderProto,perfetto.protos.KeyguardControllerProto,perfetto.protos.KeyguardPerDisplayProto,perfetto.protos.KeyguardServiceDelegateProto,perfetto.protos.LocalAnimationAdapterProto,perfetto.protos.LocaleProto,perfetto.protos.MoveAnimationSpecProto,perfetto.protos.PointProto,perfetto.protos.RemoteAnimationTargetProto,perfetto.protos.RemoteInsetsControlTargetProto,perfetto.protos.ResourcesConfigurationProto,perfetto.protos.RootWindowContainerProto,perfetto.protos.SurfaceAnimatorProto,perfetto.protos.TaskFragmentProto,perfetto.protos.TaskProto,perfetto.protos.WindowAnimationSpecProto,perfetto.protos.WindowConfigurationProto,perfetto.protos.WindowContainerChildProto,perfetto.protos.WindowContainerProto,perfetto.protos.WindowFramesProto,perfetto.protos.WindowManagerConfig,perfetto.protos.WindowManagerServicePatchProto,perfetto.protos.WindowManagerPolicyProto,perfetto.protos.WindowManagerServiceDumpProto,perfetto.protos.WindowManagerTraceEntry,perfetto.protos.WindowManagerTraceFileProto,perfetto.protos.WindowOrientationListenerProto,perfetto.protos.WindowStateAnimatorProto,perfetto.protos.WindowStateProto,perfetto.protos.WindowSurfaceControllerProto,perfetto.protos.WindowTokenProto,perfetto.protos.InsetsStateControllerProto,perfetto.protos.DisplayPolicyProto,perfetto.protos.DecorInsetsProto,perfetto.protos.DecorInsetsInfoProto,perfetto.protos.AppearanceRegionProto,perfetto.protos.SystemBarVisibilityOverrideProto,perfetto.protos.InsetsPolicyProto,perfetto.protos.InsetsControlTargetProto,perfetto.protos.DisplayFramesProto," +
229229

230230
// AndroidTrackEvent protos
231-
"perfetto.protos.AndroidMessageQueue,perfetto.protos.AndroidJobSchedulerJob,perfetto.protos.AndroidBitmap,perfetto.protos.AndroidSurfaceFlingerWorkload,perfetto.protos.AndroidSurfaceFlingerWorkload.Source,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.SfCpu,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.Hwc,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.Re,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.Skia,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Stats,perfetto.protos.AndroidBroadcastEvent,perfetto.protos.AndroidFreezerEvent,perfetto.protos.AndroidProcessStartEvent,perfetto.protos.AndroidProcessDiedEvent,perfetto.protos.AndroidProcessStateChangedEvent,perfetto.protos.AndroidBinderDiedEvent,perfetto.protos.AndroidTrackEvent " +
231+
"perfetto.protos.AndroidMessageQueue,perfetto.protos.AndroidJobSchedulerJob,perfetto.protos.AndroidBitmap,perfetto.protos.AndroidSurfaceFlingerWorkload,perfetto.protos.AndroidSurfaceFlingerWorkload.Source,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.SfCpu,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.Hwc,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.Re,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Timings.Skia,perfetto.protos.AndroidSurfaceFlingerWorkload.Summary.Stats,perfetto.protos.AndroidBroadcastEvent,perfetto.protos.AndroidFreezerEvent,perfetto.protos.AndroidProcessStartEvent,perfetto.protos.AndroidProcessDiedEvent,perfetto.protos.AndroidProcessStateChangedEvent,perfetto.protos.AndroidBinderDiedEvent,perfetto.protos.AndroidServiceStateChangedEvent,perfetto.protos.AndroidProviderStateChangedEvent,perfetto.protos.AndroidTrackEvent " +
232232

233233
"--javastream_out=$(genDir)/$(in) " +
234234
"-Iexternal/protobuf/src " +

BUILD

Lines changed: 621 additions & 128 deletions
Large diffs are not rendered by default.

BUILD.gn

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ if (enable_perfetto_trace_processor && enable_perfetto_trace_processor_sqlite) {
5050
all_targets += [ "src/bigtrace/worker:worker_main" ]
5151
}
5252
all_targets += [ "src/trace_processor:trace_processor_shell" ]
53+
if (perfetto_build_standalone) {
54+
all_targets += [ "src/trace_processor/perfetto_sql/pfsql" ]
55+
}
5356
}
5457

5558
if (enable_perfetto_trace_processor) {
@@ -201,8 +204,12 @@ if (perfetto_build_standalone) {
201204
if (is_linux || is_android || is_mac || is_freebsd) {
202205
all_targets += [ "src/tracebox" ]
203206
}
207+
}
204208

205-
# This is needed by `tools/gen_c_protos`.
209+
# Needed by `tools/gen_c_protos` (standalone) and `tools/gen_android_bp`
210+
# (generator), which lists the host target in default_targets so Soong gets a
211+
# cc_binary_host for Android-tree .pzc.h codegen.
212+
if (perfetto_build_standalone || is_perfetto_build_generator) {
206213
all_targets += [ "src/protozero/protoc_plugin:protozero_c_plugin" ]
207214
}
208215

CHANGELOG

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ Unreleased:
1111
SDK:
1212
*
1313

14+
15+
v55.1 - 2026-05-13:
16+
Infra:
17+
* Fix build of prebuilts on Windows.
18+
Trace Processor:
19+
* Fix parsing of timestamps of Adreno ftrace events.
20+
21+
1422
v55.0 - 2026-04-29:
1523
Tracing service and probes:
1624
* Breaking change: Renamed the `TraceMetadata` proto to `TraceAttributes`.

docs/AGENTS-ui.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To build and serve the UI for development:
4242
```sh
4343
# From the repository root
4444
ui/build # Builds the UI.
45-
ui/build --typecheck # Run tsc --noEmit, does't bundle (faster).
45+
ui/build --typecheck # Run tsc --noEmit, doesn't bundle (faster).
4646
ui/run-dev-server # Starts the development server with live reload.
4747
```
4848

@@ -228,7 +228,7 @@ async onTraceLoad(trace: Trace): Promise<void> {
228228

229229
## Track creation
230230

231-
Rarely you need to create a new Track from scrach.
231+
Rarely you need to create a new Track from scratch.
232232
In most cases you can use higher level components in ui/src/components/tracks/, especially DatasetSliceTrack (examples in /docs/contributing/ui-plugins.md).
233233
Look at those examples first and keep creating a track via trace.tracks.registerTrack as a last-resort.
234234

docs/analysis/perfetto-sql-syntax.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tooling e.g. it cannot be used to create efficient analytic tables, import
1313
modules from the PerfettoSQL standard library etc.
1414

1515
For this reason, PerfettoSQL adds new pieces of syntax which make the experience
16-
of writing SQL queries better. All such additons include the keyword `PERFETTO`
16+
of writing SQL queries better. All such additions include the keyword `PERFETTO`
1717
to make it clear that they are PerfettoSQL-only.
1818

1919
<!-- TODO(b/290185551): we should really talk about our "recommendations" (e.g.
@@ -71,7 +71,7 @@ schemas, function arguments and return types:
7171
| `ARGSETID` | An identifier for a set of arguments. This set can be obtained by joining with an `args` table on `arg_set_id` column. |
7272
| `ID` | An ID column for this table. Each table can have only one ID column, whose values should be unique and fit into `uint32`. |
7373
| `JOINID(table.column)` | A foreign key reference into a given table. `table` should exist, should have column named `column` of type `ID`. |
74-
| `ID(table.column)` | A variant of the `ID` type, which is both primary key for this table and simultaneusly is a foreign key reference into another table. Useful when a given table is based on a subset of rows from another table (e.g. `slice`). |
74+
| `ID(table.column)` | A variant of the `ID` type, which is both primary key for this table and simultaneously is a foreign key reference into another table. Useful when a given table is based on a subset of rows from another table (e.g. `slice`). |
7575

7676
## Defining functions
7777
`CREATE PEFETTO FUNCTION` allows functions to be defined in SQL, which can be
@@ -186,7 +186,7 @@ CREATE OR REPLACE PERFETTO INDEX foo_track_and_name ON foo(track_id, name);
186186

187187
The performance of those two queries should be very different now:
188188
```sql
189-
-- This doesn't have an index so it will have to linearily scan whole column.
189+
-- This doesn't have an index so it will have to linearly scan whole column.
190190
SELECT * FROM slice WHERE track_id = 10 AND name > "b";
191191

192192
-- This has an index and can use binary search.
@@ -238,7 +238,7 @@ performance-sensitive query, a macro can be more efficient as it avoids the
238238
potential overhead of function calls in a large number.
239239

240240
NOTE: Macros are expanded with a pre-processing step *before* any execution
241-
happens. Expansion is a purely syntatic operation involves replacing the macro
241+
happens. Expansion is a purely syntactic operation involves replacing the macro
242242
invocation with the SQL tokens in the macro definition.
243243

244244
As macros are syntactic, the types of arguments and return types in macros are

docs/analysis/trace-processor-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Trace Processor (Python)
22

3-
The trace processor Python API is built on the trace procesor
3+
The trace processor Python API is built on the trace processor
44
[C++ library](/docs/analysis/trace-processor.md). By integrating with Python,
55
the library allows using Python's rich data analysis ecosystem to process
66
traces.

docs/contributing/build-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ You need all of these both for MSVC and clang-cl:
188188
- [Python 3](https://www.python.org/downloads/windows/)
189189

190190
The [`win_find_msvc.py`](/gn/standalone/toolchain/win_find_msvc.py) script will
191-
locate the higest version numbers available from
191+
locate the highest version numbers available from
192192
`C:\Program Files (x86)\Windows Kits\10` and
193193
`C:\Program Files (x86)\Microsoft Visual Studio\2019`.
194194

@@ -251,7 +251,7 @@ target_sysroot = "/path/to/sysroot"
251251
target_triplet = "aarch64-linux-gnu" # Or any other supported triplet.
252252
```
253253

254-
For more details see the [Using cutom toolchains](#custom-toolchain) section
254+
For more details see the [Using custom toolchains](#custom-toolchain) section
255255
below.
256256

257257
## Build configurations

0 commit comments

Comments
 (0)