aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-16Update to latest catapult (be85e5fd)android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releaseChris Craik
bug:31335915 bug:31340203 bug:31551133 Change-Id: I844b83711c56f3ea8a6d0bf254a1187b62c33f81
2016-08-23Prune old pyc filesJohn Reck
Bug: 31038810 Change-Id: I800eaeae0b7c233d7dcabdbd2479bfb0132eb4ae
2016-08-19Update to latest catapult (1ff7619f)Chris Craik
bug:21925298 bug:29643805 bug:30299278 bug:30397774 bug:30953297 Change-Id: I4d73c3c5454541a50703253ebeb63e5b2ea01fec
2016-03-28Update to latest catapult (e5abb7bd)android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-dr1-releasenougat-devChris Craik
Change-Id: Ic610f2da8ecd564d5dd58cbc8b9a738ee74b2a06
2016-03-02Fix binder lock parsing.Martijn Coenen
Change-Id: Ib1ba7e33ed781a3ac4ea0a3c0ad004c25321707a
2015-12-03Merge "Merge from Catapult Tot"android-n-preview-1Ruchi Kandoi
2015-12-03Merge from Catapult TotRuchi Kandoi
Change-Id: I2dcdf5b27a70f0ce4feed542121329e1bc412fe2 Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2015-09-22am 824ce195: am 98ccdc77: Merge "Update to catapult ToT."Martijn Coenen
* commit '824ce1956f1c4fbf6dcb62bd849e578d5c8b9749': Update to catapult ToT.
2015-09-22am 98ccdc77: Merge "Update to catapult ToT."Martijn Coenen
* commit '98ccdc774ce8053dd8c3ab351d6d1f2cd37b0303': Update to catapult ToT.
2015-09-22Merge "Update to catapult ToT."Martijn Coenen
2015-09-18Update to catapult ToT.Martijn Coenen
Change-Id: Id788f91d18002ac1a5065d494dd66e63f84e1f85
2015-09-02am b2331bc7: am 99b3089d: Merge "Update after moving the code to Catapult"Chris Craik
* commit 'b2331bc7fbd6cc9e0d40325c0ff8a41eb85b8c89': Update after moving the code to Catapult
2015-09-02am 99b3089d: Merge "Update after moving the code to Catapult"Chris Craik
* commit '99b3089da411c44ae36b59fe147cdd055150eda3': Update after moving the code to Catapult
2015-09-02Merge "Update after moving the code to Catapult"Chris Craik
2015-08-28Update after moving the code to CatapultZhen Wang
Change-Id: I0b9e15f8d5743811f3a722e7a692e89e7e36734e Signed-off-by: Zhen Wang <zhenw@google.com>
2015-08-27am 1c4e01bd: (-s ours) am ee56b2f0: Merge "Fix systrace unittests before ↵Chris Craik
moving to Catapult" * commit '1c4e01bdf85c4912d14e72cbf7efdcbc55032070':
2015-08-27am 9c34c873: (-s ours) resolved conflicts for merge of 0277072f to ↵John Reck
mnc-dev-plus-aosp * commit '9c34c87307ca867df9928a7fbc8f6c1b8f556699':
2015-08-27am f66cc6a3: (-s ours) am 5a59c213: Merge "Double the default buffer size if ↵John Reck
sched is set" * commit 'f66cc6a37d5f70578dd376746a94c217f7426f6f':
2015-08-27am fb0318d2: (-s ours) am ca4ce61e: Merge "Update to latest catapult"John Reck
* commit 'fb0318d2f3d33cb960bd7430eab9518b1e6513be':
2015-08-27am f6d1f6b7: (-s ours) am a7946b36: Merge "Upgrade to new import methods."Chris Craik
* commit 'f6d1f6b742e56f9ea2690d586d73e7997127890f':
2015-08-27am c590b688: (-s ours) am 7f57422d: Merge "Update to catapult ToT for tracing."Chris Craik
* commit 'c590b6882296ff59f07507b8ed46b0dcddfc5ed8':
2015-08-27am 327feb1c: (-s ours) am 101156fa: Merge "Upgrade update.py to catapult ↵Chris Craik
repo changes" * commit '327feb1c224246fe291f232644763683cd6eb244':
2015-08-27am 80b0e9c8: (-s ours) am d09b4de6: Merge "Changed how pre processing ↵Riley Andrews
commands are issued & added fix_tgids opt." * commit '80b0e9c88ca5158a81929c108542ae4796c5bfba':
2015-08-27am 5e43ab46: (-s ours) am d60502be: Merge "Enable Systrace to be used during ↵Yasuhiro Matsuda
boot." * commit '5e43ab46c5e04d8fa99f2648485fcdb4a99c8bd9':
2015-08-27am f44e252f: (-s ours) am b2cbf159: Update to latest trace-viewer (a7f1c1b3)Chris Craik
* commit 'f44e252f39f01318148d7cdadf251c7af4884367':
2015-08-27am bc259bd7: (-s ours) am 71c9a1bd: Merge "Update to latest trace-viewer ↵Chris Craik
(a7f1c1b3)" * commit 'bc259bd7177aa2d2a0558f7f1e3adf8306c385c6':
2015-08-27am 069ead24: (-s ours) am 25c561df: Merge "add unit test for --from-file option"Chris Craik
* commit '069ead24505eb36c878484cf51e545ea4f850774':
2015-08-27am 063268b9: (-s ours) am ad0b04f5: Sync to latest from aosp masterChris Craik
* commit '063268b9523fd1a1085a37a4172f0f744b19e142':
2015-08-24am ee56b2f0: Merge "Fix systrace unittests before moving to Catapult"Chris Craik
* commit 'ee56b2f0e03cfbab8f4c8070311f3e17adffbfdb': Fix systrace unittests before moving to Catapult
2015-08-24am ee56b2f0: Merge "Fix systrace unittests before moving to Catapult"Chris Craik
* commit 'ee56b2f0e03cfbab8f4c8070311f3e17adffbfdb': Fix systrace unittests before moving to Catapult
2015-08-24Merge "Fix systrace unittests before moving to Catapult"Chris Craik
2015-08-22Fix systrace unittests before moving to CatapultZhen Wang
Change-Id: If78ab1cde4a21f690b519a0accbcd82c28f46556 Signed-off-by: Zhen Wang <zhenw@google.com>
2015-08-20resolved conflicts for merge of 0277072f to mnc-dr-dev-plus-aospJohn Reck
Change-Id: Ie3adfcdaede1ffc5d8cd9c9080eb0872cda5dea0
2015-08-20resolved conflicts for merge of 0277072f to mnc-dev-plus-aospJohn Reck
Change-Id: Ifb61aeb487a1312c6764b131c6f7d783a5da85f9
2015-08-20am 5a59c213: Merge "Double the default buffer size if sched is set"John Reck
* commit '5a59c2135508b0d7c56d742f1ee6e5d79c49d801': Double the default buffer size if sched is set
2015-08-20am 5a59c213: Merge "Double the default buffer size if sched is set"John Reck
* commit '5a59c2135508b0d7c56d742f1ee6e5d79c49d801': Double the default buffer size if sched is set
2015-08-20Merge "Double the default buffer size if sched is set"John Reck
2015-08-20am ca4ce61e: Merge "Update to latest catapult"John Reck
* commit 'ca4ce61e89f9ef56a1c7ecf1e621930a7a6159bb': Update to latest catapult
2015-08-20am ca4ce61e: Merge "Update to latest catapult"John Reck
* commit 'ca4ce61e89f9ef56a1c7ecf1e621930a7a6159bb': Update to latest catapult
2015-08-20Merge "Update to latest catapult"John Reck
2015-08-20Double the default buffer size if sched is setJohn Reck
sched is especially talkative and the default buffer size of 2048kb is not quite cutting it anymore, so if an explicit buffer size is not set double the default size if sched is enabled Change-Id: I0fa46dafb2ad8253a173ab38556721ba2017117e
2015-08-20Update to latest catapultJohn Reck
Bug: 23281041 Change-Id: I68b14f607d624d979b324b956550c4877ed8485b
2015-08-20Add 'n' and 'p' to the regexp for the need-resched bit.android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-devmarshmallow-devBen Cheng
According to the ftrace doc, need-resched can have the following encodings: 'N' both TIF_NEED_RESCHED and PREEMPT_NEED_RESCHED is set, 'n' only TIF_NEED_RESCHED is set, 'p' only PREEMPT_NEED_RESCHED is set, '.' otherwise. BUG: 23281041 Change-Id: Ia4dd4a5d912c41f3be7077533a08bfbe8bc89032
2015-08-19am a7946b36: Merge "Upgrade to new import methods."Chris Craik
* commit 'a7946b36d7115dfaad5510119808a7e899bff4f1': Upgrade to new import methods.
2015-08-19am a7946b36: Merge "Upgrade to new import methods."Chris Craik
* commit 'a7946b36d7115dfaad5510119808a7e899bff4f1': Upgrade to new import methods.
2015-08-19Merge "Upgrade to new import methods."Chris Craik
2015-08-19Upgrade to new import methods.Dan Sinclair
This CL updates catapult/ to ToT and changes prefix.html to use the new tr.importer.Import() class instead of importing directly off of the model. Change-Id: If31868dd17394a0b36f2270ba77ce020929d1db8 Signed-off-by: Dan Sinclair <dsinclair@google.com>
2015-08-18am 7f57422d: Merge "Update to catapult ToT for tracing."Chris Craik
* commit '7f57422d34c71145feaf28d1b4348c070cfb0b84': Update to catapult ToT for tracing.
2015-08-18am 101156fa: Merge "Upgrade update.py to catapult repo changes"Chris Craik
* commit '101156fa214f74e5cb67cc79f8517bd6d1e0cfd8': Upgrade update.py to catapult repo changes
2015-08-18am 7f57422d: Merge "Update to catapult ToT for tracing."Chris Craik
* commit '7f57422d34c71145feaf28d1b4348c070cfb0b84': Update to catapult ToT for tracing.