aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-26Update to latest catapult (3fe65c60)android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devWei Wang
Notable changes: Add clk_set_rate support Add clock state support Bug: 73775767 Bug: 73795364 Test: ./systrace.py Change-Id: Iafb25ba9750f0e4cea6c8278788d8837e4a8776a
2017-06-06resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aospandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7oreo-mr1-devoreo-dr1-devo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6Chris Craik
am: 88bb68148b -s ours Change-Id: Ia01e3a737ad6af93a3549b9db4703b629cde34e2
2017-06-06resolve merge conflicts of 3dd3a1ed to oc-dev-plus-aospandroid-o-mr1-preview-2android-o-mr1-preview-1Chris Craik
Test: I solemnly swear I tested this conflict resolution. Change-Id: I30a520d82d87757ea7c8ac75de70f28d89f33939
2017-06-06Merge "Update to latest catapult (6171fd4d)" am: a70bd790dfChris Craik
am: b87c8b8980 Change-Id: I1662143112bf2c0f70f0f940bd7d9bfe39fe7628
2017-06-06Merge "Update to latest catapult (6171fd4d)"Chris Craik
am: a70bd790df Change-Id: I0b2a83215b6fa9be493e62332d9f38b60ae6c707
2017-06-06Merge "Update to latest catapult (6171fd4d)"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chris Craik
2017-06-05Update to latest catapult (6171fd4d)Chris Craik
Test: ./systrace.py Merged-In: I32e0de8056cf76f834af6de6e2cb1ff1bc845a69 Change-Id: Ia972551bd2f4c3899755826763af818cf05d4ed7
2017-06-05Merge "Update to latest catapult (6171fd4d)"Chris Craik
2017-06-05Update to latest catapult (6171fd4d)Chris Craik
Test: ./systrace.py Change-Id: I32e0de8056cf76f834af6de6e2cb1ff1bc845a69
2017-06-05Merge "Add OWNERS in external/chromium-trace" am: 1aa717acc0 am: 5615936769 ↵Chih-hung Hsieh
am: 01aac487c8 am: b525633b5d Change-Id: I94e2664f47fa6d851475dfb183e0e6560dcda542
2017-06-05Merge "Add OWNERS in external/chromium-trace" am: 1aa717acc0 am: 5615936769Chih-hung Hsieh
am: 01aac487c8 Change-Id: I51b191f3adc3e1682303affc64abafe75da3d288
2017-06-05Merge "Add OWNERS in external/chromium-trace" am: 1aa717acc0Chih-hung Hsieh
am: 5615936769 Change-Id: Ie7824703458eb9a35c2336b8969b8460f4fc4240
2017-06-05Merge "Add OWNERS in external/chromium-trace"Chih-hung Hsieh
am: 1aa717acc0 Change-Id: Ia75f671cc11543e1b3ef63dc27c2b55bc79b415a
2017-06-05Merge "Add OWNERS in external/chromium-trace"Chih-hung Hsieh
2017-06-05Add OWNERS in external/chromium-traceChih-Hung Hsieh
Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: Ib88bd701fb8f5b6d74b053f907e12f247c17ba70
2017-05-12Merge "Add dependency on new location of pyserial" am: d7d7cd9020 am: ↵Chris Craik
dd29d8c7e4 am: d39faf0e3c -s ours am: 1fc0056ef1 Change-Id: If6fe03d2711edfc6997991f7127720fd6815754f
2017-05-12Merge "Add dependency on new location of pyserial" am: d7d7cd9020 am: dd29d8c7e4Chris Craik
am: d39faf0e3c -s ours Change-Id: Ie4128d1ea1fd08d51ae8e0aa24b14311f1667b26
2017-05-12Merge "Add dependency on new location of pyserial" am: d7d7cd9020Chris Craik
am: dd29d8c7e4 Change-Id: I969c323e1146c791aceefcde6d04066da78d3421
2017-05-12Merge "Add dependency on new location of pyserial"Chris Craik
am: d7d7cd9020 Change-Id: I101da78c526ab945aea27333b4000668cb1b7f4e
2017-05-12Merge "Add dependency on new location of pyserial"android-o-preview-3android-n-iot-preview-4n-iot-preview-4Chris Craik
2017-05-12Add dependency on new location of pyserialChris Craik
Test: ran ./update.py, which completed successfully Change-Id: I7cc377340b490baf33ebae8705c5163e56e76f9d
2017-04-04Update to latest catapult (c69b7871) am: a0e5c0de42Chris Craik
am: 2e652b406b Change-Id: I94a0aa38548b7ad2676665e5d4a67e64502d371c
2017-04-04Update to latest catapult (c69b7871)Chris Craik
am: a0e5c0de42 Change-Id: Ibc9f70c393db3f3e11a21f44888de7f03301cb90
2017-04-03Update to latest catapult (c69b7871)android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseChris Craik
Bug:21565824 Bug:34394562 Bug:36573168 Test: ./systrace.py Notable changes: - Freq tracing on by default - Binder driver tracing on by default - Renderscript tracing on by default (on M+ devices) - UI thread ordering fixed - Async sections no longer shown twice Change-Id: I83e4b2a3964aa8898e638def81fbe3603e2a51cc
2017-04-03resolve merge conflicts of 9ede47ea to oc-dev-plus-aospChris Craik
am: c088b23ae5 Change-Id: I1ea3224c203fd8aae51e7c56a46c0701d32e6cb3
2017-04-03resolve merge conflicts of 9ede47ea to oc-dev-plus-aospChris Craik
Test: external/chromium-trace/systrace.py Change-Id: I06f10b563d774ebcd6ebee75eb3622d0d71795c2
2017-04-03Merge "Update to latest catapult (c69b7871)" am: cd2d4f530aChris Craik
am: 97b70dcd33 Change-Id: I5dd41da7ae734e41e80f4366977a466e8117884d
2017-04-03Merge "Update to latest catapult (c69b7871)"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Chris Craik
am: cd2d4f530a Change-Id: If7ca251619faa34d8bd907f924cc5935e7f61012
2017-04-03Merge "Update to latest catapult (c69b7871)"Chris Craik
2017-03-29Update to latest catapult (c69b7871)Chris Craik
Bug:21565824 Bug:34394562 Bug:36573168 Test: ./systrace.py Notable changes: - Freq tracing on by default - Binder driver tracing on by default - Renderscript tracing on by default (on M+ devices) - UI thread ordering fixed - Async sections no longer shown twice Change-Id: I83e4b2a3964aa8898e638def81fbe3603e2a51cc
2017-03-13Merge "Sync to internal master" am: 6f2b0c6d0b am: 709e152c8eChris Craik
am: 5846163f55 -s ours Change-Id: I0d6f6a26cdae36bcc73da428dbae698965756049
2017-03-13Merge "Include telemetry in packaging" am: f352ddd9ba -s ours am: 6bbe1323abJohn Reck
am: d43ec465b5 Change-Id: I9c84259c04814df3683b5686ae59eff7ebc7413b
2017-03-13Merge "Sync to internal master" am: 6f2b0c6d0bChris Craik
am: 709e152c8e Change-Id: I9e817a4f455a40a9b85ef493ac5638f8d6c2e87b
2017-03-13Merge "Include telemetry in packaging" am: f352ddd9ba -s oursJohn Reck
am: 6bbe1323ab Change-Id: Ibeb6a5f3ed47305b3385b1d5c44f4c4333307b92
2017-03-13Merge "Sync to internal master"Chris Craik
am: 6f2b0c6d0b Change-Id: I5368e0a68e271dac158c9ff4cb8eba10c5b1c902
2017-03-13Merge "Include telemetry in packaging"John Reck
am: f352ddd9ba -s ours Change-Id: I45dca1952d75c2519b49ee384b8d7dbc84b6552e
2017-03-13Merge "Sync to internal master"android-n-mr2-preview-2Chris Craik
2017-03-13Merge "Include telemetry in packaging"Treehugger Robot
2017-03-13Sync to internal masterChris Craik
Syncs to upstream revision e2a178a9c0cdc4e6aa745af113bc9b7ae3651aa8 via update.py --local=<internal-path> Test: ran systrace.py locally Change-Id: Ieb2b634438a4e408b46d2fb9621ed19d65520cf4
2017-03-13Include telemetry in packagingJohn Reck
Bug: 34225046 telemetry/third_party/pyserial contains the wrapper scripts necessary for the import serial to work on MacOS Test: run update.py && systrace.py on mac Change-Id: I120e39022fc36cf2dab7084fc398ebc779249d51
2017-02-22Merge "Do not check in upstream OWNERS files"TreeHugger Robot
2017-02-22Do not check in upstream OWNERS filesChris Craik
Bug: 33166666 Bug: 35635929 Test: update.py --local=catapult-local Change-Id: I4f16655a2a634b0526417fdaaba6641d9564332f Manual cherry-pick of 4da9498423988e795cee12789baf39f3f80fd4d3 from aosp master.
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE" am: e997428cc0 ↵Chris Craik
-s ours am: 0e6182ec9a -s ours am: e75686b1cb -s ours Change-Id: I5995f4e854625ffb24235154c0831e0751a5042e
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE" am: e997428cc0 ↵Chris Craik
-s ours am: 0e6182ec9a -s ours Change-Id: If2e58f54289f1fed26de84582d085846e4f1d2bb
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE"Chris Craik
am: e997428cc0 -s ours Change-Id: I44cf85cd0333a0bb646debbd2f6602f85cb0c07d
2017-02-22Merge "Do not check in upstream OWNERS files DO NOT MERGE"android-o-preview-1o-previewChris Craik
2017-02-22Do not check in upstream OWNERS files DO NOT MERGEChris Craik
Bug: 33166666 Bug: 35635929 Test: update.py --local=catapult-local Change-Id: I4f16655a2a634b0526417fdaaba6641d9564332f
2017-01-19Cherry pick thread name fixJohn Reck
Upstream CL: https://codereview.chromium.org/2641223002/ Test: Manual, verified thread names are showing up Change-Id: I8e9d3ca601b93cb33d1ac947e1a0c6292f998873
2017-01-18Update catapultJohn Reck
Change-Id: I910174f04ddd7be9b607f4a2a60c88e0b8bfcf20 Fixes: 34127555 Fixes: 34225046 Test: Ran systrace, viewed result
2017-01-18Include telemetry in packagingJohn Reck
Bug: 34225046 telemetry/third_party/pyserial contains the wrapper scripts necessary for the import serial to work on MacOS Test: run update.py && systrace.py on mac Change-Id: I120e39022fc36cf2dab7084fc398ebc779249d51
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 23:51:23 +0000