git.osdn.net Git - android-x86/system-extras.git/log

Alex Deymo [Thu, 25 Aug 2016 02:06:46 +0000 (02:06 +0000)]

Merge "Don't include multinetwork tools in Brillo." am: db7a1c571a am: 7dc5b65930 am: fada028a42
am: a10c77899b

Change-Id: Icbb36ee06dccf9c5bda5bb54350f30dba6326fcc

commit | commitdiff | tree

Alex Deymo [Thu, 25 Aug 2016 01:49:11 +0000 (01:49 +0000)]

Merge "Don't include multinetwork tools in Brillo." am: db7a1c571a am: 7dc5b65930
am: fada028a42

Change-Id: I4f48c5aeb94fb4c3e30a2408eb2d039d65bc5070

commit | commitdiff | tree

Alex Deymo [Thu, 25 Aug 2016 01:36:23 +0000 (01:36 +0000)]

Merge "Don't include multinetwork tools in Brillo." am: db7a1c571a
am: 7dc5b65930

Change-Id: Ic20c4d1d69db20567389f3a5cc15db5b43130d34

commit | commitdiff | tree

Alex Deymo [Thu, 25 Aug 2016 01:33:24 +0000 (01:33 +0000)]

Merge "Don't include multinetwork tools in Brillo."
am: db7a1c571a

Change-Id: I27b4a11bcdf4c578f908ffa4ca7c5a9d2599b547

commit | commitdiff | tree

Alex Deymo [Thu, 25 Aug 2016 01:28:42 +0000 (01:28 +0000)]

Merge "Don't include multinetwork tools in Brillo."

commit | commitdiff | tree

Mathias Agopian [Thu, 25 Aug 2016 01:20:18 +0000 (01:20 +0000)]

Merge "report MPKI instead of hit-rate"

commit | commitdiff | tree

Yabin Cui [Thu, 25 Aug 2016 00:15:15 +0000 (00:15 +0000)]

Merge "simpleperf: improve cpu_hotplug_test." am: a903cc9b9c am: 9e71d361ea am: 97669706ea
am: 9fdbe331d2

Change-Id: I75eed09e3de8c1fd090a8bb4cb9fa861f51dd455

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 23:52:32 +0000 (23:52 +0000)]

Merge "simpleperf: improve cpu_hotplug_test." am: a903cc9b9c am: 9e71d361ea
am: 97669706ea

Change-Id: If77f4d9aefbbc3b222711de2653c4eb761ac83e3

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 23:49:30 +0000 (23:49 +0000)]

Merge "simpleperf: improve cpu_hotplug_test." am: a903cc9b9c
am: 9e71d361ea

Change-Id: I1e78cf2aaa09819c969ca1be73269d4703b94769

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 23:46:35 +0000 (23:46 +0000)]

Merge "simpleperf: improve cpu_hotplug_test."
am: a903cc9b9c

Change-Id: I53f788aa6100b0eb6917920334efa624af14e77f

commit | commitdiff | tree

Alex Deymo [Wed, 24 Aug 2016 23:42:11 +0000 (16:42 -0700)]

Don't include multinetwork tools in Brillo.

These tools depend on libandroid, which is not present in Brillo.

Bug: 31068444
Change-Id: I0565775ab3effa910149f28bef790b6fed4e6485
Test: `make dist`

commit | commitdiff | tree

Treehugger Robot [Wed, 24 Aug 2016 23:36:28 +0000 (23:36 +0000)]

Merge "simpleperf: improve cpu_hotplug_test."

commit | commitdiff | tree

Yabin Cui [Thu, 18 Aug 2016 00:34:26 +0000 (17:34 -0700)]

simpleperf: improve cpu_hotplug_test.

1. Add offline_while_user_process_profiling test for
http://b/28086229.
2. Add options to adjust test duration and cpu hotplug
interval.
3. Report test time periodically for tests running for
a long time.

Bug: http://b/25193162
Bug: http://b/28086229
Bug: http://b/30839193

Change-Id: If02a45aed2dab718ca381b24da2898f22fed1a8d

commit | commitdiff | tree

Mathias Agopian [Wed, 24 Aug 2016 21:42:30 +0000 (14:42 -0700)]

report MPKI instead of hit-rate

MPKI (or misses per 1000 instructions) is better
for comparing CPUs, as hit-rate somewhat
meaningless (different CPUs make different
amount of requests to the same cache-line).

Also changed the —affinity option to take the
CPU number instead of a big|little string

Change-Id: I57fce77e18d382fe8d4f0efd9cc586d50beb9432

commit | commitdiff | tree

Damien Bargiacchi [Wed, 24 Aug 2016 21:06:51 +0000 (21:06 +0000)]

Merge changes from topic 'am-cca20719ce864a0298fe5d9833985170' into nyc-mr1-dev-plus-aosp
am: 09f832c851

Change-Id: Iee5f602da5588b4d24b1d260fbedbb0b2521b609

commit | commitdiff | tree

Damien Bargiacchi [Wed, 24 Aug 2016 21:06:50 +0000 (21:06 +0000)]

Merge "Remove unused function declarations" into cw-f-dev am: 6199f023a7
am: 22c1f9bd94

Change-Id: I4343f14d5cfb748d559fb5dfae65bc15be6db442

commit | commitdiff | tree

Damien Bargiacchi [Wed, 24 Aug 2016 21:06:48 +0000 (21:06 +0000)]

Remove unused function declarations am: 47c3ecb53a
am: 94b048eb69

Change-Id: Iaa1111990921ce225a6c8085debad04deeced2e2

commit | commitdiff | tree

Bill Yi [Wed, 24 Aug 2016 21:06:47 +0000 (21:06 +0000)]

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 4d269c7593 am: 1c98bd15ca am: 590203cf6b
am: c0008f08e2

Change-Id: If3a3700f85549bcfcb4f52b75003a3c0916ed2f6

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 21:06:46 +0000 (21:06 +0000)]

Merge "simpleperf: notify user for unsupported modifiers." am: 43908a31c1 am: 61cb08b492 am: dacf5b4a3c
am: 93a37a2c1b

Change-Id: Ie44ebea1fd8e2d512b3fbd048f02c38a762bfd5d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 24 Aug 2016 20:47:17 +0000 (20:47 +0000)]

Merge changes from topic 'am-cca20719ce864a0298fe5d9833985170' into nyc-mr1-dev-plus-aosp

* changes:
Merge "Remove unused function declarations" into cw-f-dev am: 6199f023a7
Remove unused function declarations am: 47c3ecb53a

commit | commitdiff | tree

Bill Yi [Wed, 24 Aug 2016 20:45:26 +0000 (20:45 +0000)]

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 4d269c7593 am: 1c98bd15ca
am: 590203cf6b

Change-Id: I8a6ba87570a118c5d781f88e4da3aa9f7ddddb74

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 20:45:25 +0000 (20:45 +0000)]

Merge "simpleperf: notify user for unsupported modifiers." am: 43908a31c1 am: 61cb08b492
am: dacf5b4a3c

Change-Id: Ia68bf60c55294a00f525558c8ab3e553a1e5c28e

commit | commitdiff | tree

Damien Bargiacchi [Wed, 24 Aug 2016 20:45:20 +0000 (20:45 +0000)]

Merge "Remove unused function declarations" into cw-f-dev
am: 6199f023a7

Change-Id: I428b58de9f99935cee84250fc1d241c107acd5dc

commit | commitdiff | tree

Damien Bargiacchi [Wed, 24 Aug 2016 20:45:19 +0000 (20:45 +0000)]

Remove unused function declarations
am: 47c3ecb53a

Change-Id: I2bdf92d7c129c2278c50abfc927828dabd1a7336

commit | commitdiff | tree

Damien Bargiacchi [Wed, 24 Aug 2016 20:36:35 +0000 (20:36 +0000)]

Merge "Remove unused function declarations" into cw-f-dev

commit | commitdiff | tree

Bill Yi [Wed, 24 Aug 2016 20:26:32 +0000 (20:26 +0000)]

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 4d269c7593
am: 1c98bd15ca

Change-Id: I04d7d35ff2d02cc9244c8fc5f1bb4e297064c97f

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 20:26:32 +0000 (20:26 +0000)]

Merge "simpleperf: notify user for unsupported modifiers." am: 43908a31c1
am: 61cb08b492

Change-Id: Ic8880b14a59346fd69a84efb456923c2a941e4f7

commit | commitdiff | tree

Bill Yi [Wed, 24 Aug 2016 20:16:27 +0000 (20:16 +0000)]

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 4d269c7593

Change-Id: I7a58fdbab63c1c4cd11973d49278571db0c50fde

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 20:16:24 +0000 (20:16 +0000)]

Merge "simpleperf: notify user for unsupported modifiers."
am: 43908a31c1

Change-Id: I4f53fa84ea663a4090a99f2261f153faf8f0b8fb

commit | commitdiff | tree

Bill Yi [Wed, 24 Aug 2016 19:08:29 +0000 (12:08 -0700)]

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 18:54:10 +0000 (18:54 +0000)]

Merge "simpleperf: notify user for unsupported modifiers."

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 17:22:24 +0000 (17:22 +0000)]

Merge "simpleperf: monitor cpu hotplug in stat cmd." am: ef99a90b46 am: d4d0a196fc am: fc658b7737
am: 9c7afed924

Change-Id: I0390cb0560edaef3f89a33dafe34ed615bb99cde

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 17:01:12 +0000 (17:01 +0000)]

Merge "simpleperf: monitor cpu hotplug in stat cmd." am: ef99a90b46 am: d4d0a196fc
am: fc658b7737

Change-Id: Ic3dc7dabf578312b4aaed271a3b25fe9db80b638

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 16:58:41 +0000 (16:58 +0000)]

Merge "simpleperf: monitor cpu hotplug in stat cmd." am: ef99a90b46
am: d4d0a196fc

Change-Id: Iddddf45bd26e2545c3cc3a77d3123d52cb44ffd2

commit | commitdiff | tree

Yabin Cui [Wed, 24 Aug 2016 16:55:23 +0000 (16:55 +0000)]

Merge "simpleperf: monitor cpu hotplug in stat cmd."
am: ef99a90b46

Change-Id: I7c89d8155b9ade3c288d92d496ec9fc84be648b6

commit | commitdiff | tree

Yabin Cui [Fri, 19 Aug 2016 22:42:39 +0000 (15:42 -0700)]

simpleperf: notify user for unsupported modifiers.

If there is no need to record samples, u/k modifiers
used in event cpu-clock and task-clock are ignored
by the kernel.

Bug: http://b/29574526
Change-Id: Id45568448888965a3bfa382c4420e395a741f77a
Test: simpleperf_unit_test.

commit | commitdiff | tree

Treehugger Robot [Wed, 24 Aug 2016 16:38:03 +0000 (16:38 +0000)]

Merge "simpleperf: monitor cpu hotplug in stat cmd."

commit | commitdiff | tree

Mathias Agopian [Wed, 24 Aug 2016 04:00:54 +0000 (04:00 +0000)]

Merge "Rewrite i-cache test"

commit | commitdiff | tree

Elliott Hughes [Wed, 24 Aug 2016 03:31:21 +0000 (03:31 +0000)]

Merge "Don't invent our own pagemap constants." am: 5079d0aabc am: cb060d9bfb am: 4bfe8527cd
am: 8fdb71539b

Change-Id: I94992d65e0d8ba530ae1b11a9e6fd8b3a54680d4

commit | commitdiff | tree

Elliott Hughes [Wed, 24 Aug 2016 03:19:48 +0000 (03:19 +0000)]

Merge "Don't invent our own pagemap constants." am: 5079d0aabc am: cb060d9bfb
am: 4bfe8527cd

Change-Id: Id55bf0c3805c5fc0eb853b9f60616f42bab71c27

commit | commitdiff | tree

Elliott Hughes [Wed, 24 Aug 2016 03:17:18 +0000 (03:17 +0000)]

Merge "Don't invent our own pagemap constants." am: 5079d0aabc
am: cb060d9bfb

Change-Id: I60b1aa9a76eb08eaeb9c546c8b2fec93bbaa5840

commit | commitdiff | tree

Elliott Hughes [Wed, 24 Aug 2016 03:13:54 +0000 (03:13 +0000)]

Merge "Don't invent our own pagemap constants."
am: 5079d0aabc

Change-Id: Ica4813dcf76197b8866307c7c0ba5fc4a56fd6e3

commit | commitdiff | tree

Treehugger Robot [Wed, 24 Aug 2016 03:05:17 +0000 (03:05 +0000)]

Merge "Don't invent our own pagemap constants."

commit | commitdiff | tree

Elliott Hughes [Wed, 24 Aug 2016 00:47:49 +0000 (17:47 -0700)]

Don't invent our own pagemap constants.

Use the uapi ones instead, so I don't have to think about whether ours
are correct.

Bug: http://b/31044648
Change-Id: Ibe4a078ad3223419301a5f585e8ed24dd7366ce2

commit | commitdiff | tree

Yabin Cui [Tue, 23 Aug 2016 23:18:20 +0000 (23:18 +0000)]

Merge "simpleperf: omit samples get while dumping thread map information." am: 84ea73e65c am: f600c50b67 am: 27cb69ae6e
am: 6b803dac28

Change-Id: Ia4090f54be77cbaf616f8462c131319978d5cb7e

commit | commitdiff | tree

Yabin Cui [Tue, 23 Aug 2016 22:32:12 +0000 (22:32 +0000)]

Merge "simpleperf: omit samples get while dumping thread map information." am: 84ea73e65c am: f600c50b67
am: 27cb69ae6e

Change-Id: I77320c7d18aa12bccceb3e60d3ef2f4d1b094717

commit | commitdiff | tree

Yabin Cui [Tue, 23 Aug 2016 22:29:13 +0000 (22:29 +0000)]

Merge "simpleperf: omit samples get while dumping thread map information." am: 84ea73e65c
am: f600c50b67

Change-Id: Ic333f4f9912c3329a1e7bf5ffef59e069b73e1d4

commit | commitdiff | tree

Yabin Cui [Tue, 23 Aug 2016 22:26:57 +0000 (22:26 +0000)]

Merge "simpleperf: omit samples get while dumping thread map information."
am: 84ea73e65c

Change-Id: I7f7aa533eb8f4d0d224981f2b2865ee45e0d718f

commit | commitdiff | tree

Treehugger Robot [Tue, 23 Aug 2016 22:17:15 +0000 (22:17 +0000)]

Merge "simpleperf: omit samples get while dumping thread map information."

commit | commitdiff | tree

Yabin Cui [Tue, 23 Aug 2016 20:18:47 +0000 (13:18 -0700)]

simpleperf: omit samples get while dumping thread map information.

Bug: http://b/31039737
Change-Id: Ia65c61b874a2f60d7022be3ef0774f5fc6b09d7c
Test: test manually as described in the bug.

commit | commitdiff | tree

Mathias Agopian [Wed, 17 Aug 2016 02:42:42 +0000 (19:42 -0700)]

Rewrite i-cache test

+ cleanup
+ use performance counters in addition to time
+ update test to handle more modern CPU with more i-cache

Change-Id: I6f96c4f8c3b67344694a4b33a25c078e116328ca

commit | commitdiff | tree

Yabin Cui [Mon, 22 Aug 2016 23:19:17 +0000 (23:19 +0000)]

Merge "simpleperf: avoid selinux denials." am: 23a73bf538 am: fdf68bdcf9 am: dfb698649f
am: 55beade171

Change-Id: I8176202544a121be145eab92080d36a96e3ac9c2

commit | commitdiff | tree

Yabin Cui [Mon, 22 Aug 2016 23:14:39 +0000 (23:14 +0000)]

Merge "simpleperf: avoid selinux denials." am: 23a73bf538 am: fdf68bdcf9
am: dfb698649f

Change-Id: Ib36c4dde4a75785b41db9e046c9391d353674bec

commit | commitdiff | tree

Yabin Cui [Mon, 22 Aug 2016 23:10:38 +0000 (23:10 +0000)]

Merge "simpleperf: avoid selinux denials." am: 23a73bf538
am: fdf68bdcf9

Change-Id: Ifc23416aee051bfc40077dfb6b2258644e3aa9e2

commit | commitdiff | tree

Yabin Cui [Mon, 22 Aug 2016 23:06:27 +0000 (23:06 +0000)]

Merge "simpleperf: avoid selinux denials."
am: 23a73bf538

Change-Id: Ia5b6064a5f3936f739480221a9603b66b744ed6f

commit | commitdiff | tree

Treehugger Robot [Mon, 22 Aug 2016 22:55:25 +0000 (22:55 +0000)]

Merge "simpleperf: avoid selinux denials."

commit | commitdiff | tree

Yabin Cui [Mon, 22 Aug 2016 20:39:19 +0000 (13:39 -0700)]

simpleperf: avoid selinux denials.

1. Don't stat() entries in /proc directory if not necessary.
2. Don't read tracing events in debugfs if not root.

Bug: http://b/30981595
Change-Id: Ic695671357dad936d60f4e6d573ce4452dec217c
Test: run `simpleperf list` and check kmsg.

commit | commitdiff | tree

Yabin Cui [Sat, 20 Aug 2016 00:24:37 +0000 (17:24 -0700)]

simpleperf: monitor cpu hotplug in stat cmd.

Move code used to monitor cpu hotplug events
from cmd_record.cpp to event_selection_set.cpp,
so it can also be used by stat cmd.

Bug: http://b/29245608
Change-Id: I1f5f3268192aa5c98c0be9fc1de763352c08eab6
Test: run simpleperf stat, and online/offline a cpu.

commit | commitdiff | tree

Colin Cross [Wed, 17 Aug 2016 19:10:31 +0000 (19:10 +0000)]

Merge "Build icache for arm on arm64" am: cb0112fe64 am: 04c00f843e am: 72e4bb0217
am: 9e19e357e9

Change-Id: Id6dc5359c93d76b948ab8843e6877e0ba3b23127

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 17 Aug 2016 19:10:30 +0000 (19:10 +0000)]

Merge "Fix google-explicit-constructor warnings in ext4_utils." am: e2d0366442 -s ours am: dab4f37b48 am: 2d64812d0b
am: 0be24cf925

Change-Id: Ie755e6b609714e400aa5274890f5498a1b4437a7

commit | commitdiff | tree

Colin Cross [Wed, 17 Aug 2016 18:29:51 +0000 (18:29 +0000)]

Merge "Build icache for arm on arm64" am: cb0112fe64 am: 04c00f843e
am: 72e4bb0217

Change-Id: I367f9d4586ed83d4c8d01ef906a267f24026ae13

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 17 Aug 2016 18:29:50 +0000 (18:29 +0000)]

Merge "Fix google-explicit-constructor warnings in ext4_utils." am: e2d0366442 -s ours am: dab4f37b48
am: 2d64812d0b

Change-Id: I64d922ad3e552d0a483d9e9ac62c50b7f2c544e9

commit | commitdiff | tree

Colin Cross [Wed, 17 Aug 2016 18:21:27 +0000 (18:21 +0000)]

Merge "Build icache for arm on arm64" am: cb0112fe64
am: 04c00f843e

Change-Id: I0793b130cbed2483bd3fe3c047f393558d59361c

commit | commitdiff | tree

Colin Cross [Wed, 17 Aug 2016 18:18:49 +0000 (18:18 +0000)]

Merge "Build icache for arm on arm64"
am: cb0112fe64

Change-Id: I5554ac7aaf799dda68731802bd8668b3db5bbfb5

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 17 Aug 2016 18:02:54 +0000 (18:02 +0000)]

Merge "Fix google-explicit-constructor warnings in ext4_utils." am: e2d0366442 -s ours
am: dab4f37b48

Change-Id: I1f7f2be9fc0817fa7ccc4211d9daa38d4042efc3

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 17 Aug 2016 17:47:58 +0000 (17:47 +0000)]

Merge "Fix google-explicit-constructor warnings in ext4_utils."
am: e2d0366442 -s ours

Change-Id: Ic9f51fa2ad2f69004afc51fb31a75aa910697b0c

commit | commitdiff | tree

Damien Bargiacchi [Wed, 17 Aug 2016 00:42:39 +0000 (17:42 -0700)]

Remove unused function declarations

Change-Id: I71dc112b3e1028e3ec3d3c1ec832959b1232f2f6

commit | commitdiff | tree

Colin Cross [Wed, 17 Aug 2016 00:08:03 +0000 (00:08 +0000)]

Merge "Build icache for arm on arm64"

commit | commitdiff | tree

Colin Cross [Tue, 16 Aug 2016 22:23:45 +0000 (15:23 -0700)]

Build icache for arm on arm64

Change-Id: Iac9511f7d943fde9e00d21d46ca32f186d4d5673

commit | commitdiff | tree

Chih-hung Hsieh [Tue, 16 Aug 2016 16:50:45 +0000 (16:50 +0000)]

Merge "Fix google-explicit-constructor warnings in ext4_utils."

commit | commitdiff | tree

Yabin Cui [Tue, 16 Aug 2016 00:10:21 +0000 (00:10 +0000)]

Merge "simpleperf: add simpleperf_report.py to sdk artifacts." am: 64d7033269 am: 12532f668f am: 7d43d2fb0b
am: f84c439d39

Change-Id: I870f92ecafbb98dee3477d6c819b85f527a5fccb

commit | commitdiff | tree

Yabin Cui [Tue, 16 Aug 2016 00:00:30 +0000 (00:00 +0000)]

Merge "simpleperf: add simpleperf_report.py to sdk artifacts." am: 64d7033269 am: 12532f668f
am: 7d43d2fb0b

Change-Id: I2924d2cdb9b5ddcac68683d89a49187126f0560e

commit | commitdiff | tree

Yabin Cui [Mon, 15 Aug 2016 23:56:29 +0000 (23:56 +0000)]

Merge "simpleperf: add simpleperf_report.py to sdk artifacts." am: 64d7033269
am: 12532f668f

Change-Id: I93e48fe203847850dc19bf25158225b619597202

commit | commitdiff | tree

Yabin Cui [Mon, 15 Aug 2016 23:52:02 +0000 (23:52 +0000)]

Merge "simpleperf: add simpleperf_report.py to sdk artifacts."
am: 64d7033269

Change-Id: I81c8b93e7ded46ba397eee79ea12b50ca051b1e6

commit | commitdiff | tree

Yabin Cui [Mon, 15 Aug 2016 23:42:30 +0000 (23:42 +0000)]

Merge "simpleperf: add simpleperf_report.py to sdk artifacts."

commit | commitdiff | tree

Yabin Cui [Fri, 12 Aug 2016 22:19:40 +0000 (15:19 -0700)]

simpleperf: add simpleperf_report.py to sdk artifacts.

Bug: http://b/28911532
Change-Id: I27ddc735c5629c65e7ef9f1218551ed048b39a08
Test: None.

commit | commitdiff | tree

James Carr [Fri, 12 Aug 2016 17:58:46 +0000 (17:58 +0000)]

Merge "Add functionality to memcpy-perf benchmark"

commit | commitdiff | tree

Dan Albert [Fri, 12 Aug 2016 09:28:36 +0000 (09:28 +0000)]

Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24 am: 632565e26c
am: 4a85f36c2e

Change-Id: I9abfe957e2f1ad890d82a485b8cf648a7b774b26

commit | commitdiff | tree

Dan Albert [Fri, 12 Aug 2016 09:24:57 +0000 (09:24 +0000)]

Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29 am: 37bbf91a24
am: 632565e26c

Change-Id: I7d33bbc218469ba70ce68cdca5571018a091fd45

commit | commitdiff | tree

Dan Albert [Fri, 12 Aug 2016 09:21:58 +0000 (09:21 +0000)]

Merge "Stop hard coding gtest/gmock things." am: 9aef6c7d29
am: 37bbf91a24

Change-Id: Ib46bf14481699dd5fbef4e5cc933ecdb584cced9

commit | commitdiff | tree

Dan Albert [Fri, 12 Aug 2016 09:18:30 +0000 (09:18 +0000)]

Merge "Stop hard coding gtest/gmock things."
am: 9aef6c7d29

Change-Id: Ied120d80f30e9b81314ad13f6b32450f54f298fa

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Aug 2016 09:15:46 +0000 (09:15 +0000)]

Merge "Stop hard coding gtest/gmock things."

commit | commitdiff | tree

Nick Desaulniers [Fri, 12 Aug 2016 04:43:50 +0000 (04:43 +0000)]

Merge "procrank: fix bounds check to prevent heap overflow" am: 79dcfb73a2 am: b11c7eb720 am: 071dce8236
am: 75e79b874e

Change-Id: I219bb4f6d3c96e915ebc15dd13cdfd804d0df8ef

commit | commitdiff | tree

Nick Desaulniers [Fri, 12 Aug 2016 04:40:41 +0000 (04:40 +0000)]

Merge "procrank: fix bounds check to prevent heap overflow" am: 79dcfb73a2 am: b11c7eb720
am: 071dce8236

Change-Id: I4a0e910ffba61181ab7c64f2226ea3cf147866c6

commit | commitdiff | tree

Nick Desaulniers [Fri, 12 Aug 2016 04:37:10 +0000 (04:37 +0000)]

Merge "procrank: fix bounds check to prevent heap overflow" am: 79dcfb73a2
am: b11c7eb720

Change-Id: I29a9ea016d766c0d93a8361787532ab96ba4f0c3

commit | commitdiff | tree

Nick Desaulniers [Fri, 12 Aug 2016 04:34:13 +0000 (04:34 +0000)]

Merge "procrank: fix bounds check to prevent heap overflow"
am: 79dcfb73a2

Change-Id: Ied99331e9d88c1c5bcffc050164f7727ae46ae0e

commit | commitdiff | tree

Treehugger Robot [Fri, 12 Aug 2016 04:27:37 +0000 (04:27 +0000)]

Merge "procrank: fix bounds check to prevent heap overflow"

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 11 Aug 2016 23:56:23 +0000 (23:56 +0000)]

Merge "Fix google-explicit-constructor warnings in simpleperf." am: eddb94dc8b am: 9ebb388c20 am: 02ab7380d5
am: 2141b16751

Change-Id: Ifa41807026e10d6b5853bc5716aeef01f2770dfe

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 11 Aug 2016 23:53:22 +0000 (23:53 +0000)]

Merge "Fix google-explicit-constructor warnings in simpleperf." am: eddb94dc8b am: 9ebb388c20
am: 02ab7380d5

Change-Id: Ic57a2c0c21f76e38216bb3b36811311623289637

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 11 Aug 2016 23:49:52 +0000 (23:49 +0000)]

Merge "Fix google-explicit-constructor warnings in simpleperf." am: eddb94dc8b
am: 9ebb388c20

Change-Id: I929dd04d2325b6049021ed20b6bc0efba6844d18

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:02 +0000 (23:48 +0000)]

Merge "Fix google-explicit-constructor warnings in simpleperf."
am: eddb94dc8b

Change-Id: I55d778ab19963fa33e4ff37ce24ed3dafe19a9cd

commit | commitdiff | tree

Treehugger Robot [Thu, 11 Aug 2016 23:33:53 +0000 (23:33 +0000)]

Merge "Fix google-explicit-constructor warnings in simpleperf."

commit | commitdiff | tree

Greg Kaiser [Thu, 11 Aug 2016 22:15:38 +0000 (22:15 +0000)]

Merge "ANRdaemon: Don't leak file in error case"

commit | commitdiff | tree

Nick Desaulniers [Wed, 10 Aug 2016 22:44:19 +0000 (15:44 -0700)]

procrank: fix bounds check to prevent heap overflow

Bug: 30774296
Change-Id: I44005caaa3cc17fe829f375a4cfeb5a464c97fbe
(cherry picked from commit 98a20cd1283b6ee029e871c0876815300475c40a)

commit | commitdiff | tree

Dan Albert [Thu, 11 Aug 2016 19:45:53 +0000 (12:45 -0700)]

Stop hard coding gtest/gmock things.

The headers are exported, and the build system automatically adds
libgtest for test modules.

Test: mma
Bug: None
Change-Id: I99373732aa71244c6dc8bfa21c5d06190ce76ada

commit | commitdiff | tree

Greg Kaiser [Thu, 11 Aug 2016 18:40:44 +0000 (11:40 -0700)]

ANRdaemon: Don't leak file in error case

Change-Id: Ie57e06fac90629dfadc04510b2468f17f68fce90

commit | commitdiff | tree

Chih-Hung Hsieh [Thu, 11 Aug 2016 18:06:00 +0000 (11:06 -0700)]

Fix google-explicit-constructor warnings in simpleperf.

Bug: 28341362
Change-Id: I35f2be2563cd1dcd5bdac25e8e801c08eb665db5
Test: build with WITH_TIDY=1

commit | commitdiff | tree

David Zeuthen [Thu, 11 Aug 2016 14:58:19 +0000 (14:58 +0000)]

Merge "avb: Add common verified boot tools and library." am: 17361eb23c am: 3cbfa8ce60 am: d56bce161b
am: a2a310a01e

Change-Id: I5e81564d860331db678a904c19c36d715186b56e

commit | commitdiff | tree

David Zeuthen [Thu, 11 Aug 2016 14:52:19 +0000 (14:52 +0000)]

Merge "avb: Add common verified boot tools and library." am: 17361eb23c am: 3cbfa8ce60
am: d56bce161b

Change-Id: I9605e8281ca37f55c4d5446d34a1f448e151858d

commit | commitdiff | tree

David Zeuthen [Thu, 11 Aug 2016 14:48:48 +0000 (14:48 +0000)]

Merge "avb: Add common verified boot tools and library." am: 17361eb23c
am: 3cbfa8ce60

Change-Id: Icb6ace6b077b9ab9f015a6b497e0e4c13edc2f4c