OSDN Git Service
Yabin Cui [Fri, 24 Jul 2015 18:41:14 +0000 (18:41 +0000)]
am
ae5cab41: Merge "Simpleperf: work around unexpected (pid, tid) pair."
* commit '
ae5cab410f747ac18a8ef0341322d997c44dfb7d':
Simpleperf: work around unexpected (pid, tid) pair.
Yabin Cui [Fri, 24 Jul 2015 18:19:45 +0000 (18:19 +0000)]
am
5c9978ce: Merge "Simpleperf: use ThreadTree when getting hit files in record command."
* commit '
5c9978ceeaeac2442c0ca4722111551ecbe6d144':
Simpleperf: use ThreadTree when getting hit files in record command.
Yabin Cui [Fri, 24 Jul 2015 18:15:52 +0000 (18:15 +0000)]
Merge "Simpleperf: work around unexpected (pid, tid) pair."
Yabin Cui [Fri, 24 Jul 2015 18:00:44 +0000 (11:00 -0700)]
Simpleperf: work around unexpected (pid, tid) pair.
Bug:
22185053
Change-Id: Ibd224ce9918eac9fa5a71ec00835b3af2b03e578
Yabin Cui [Fri, 24 Jul 2015 17:50:33 +0000 (17:50 +0000)]
Merge "Simpleperf: use ThreadTree when getting hit files in record command."
Yabin Cui [Fri, 24 Jul 2015 04:39:57 +0000 (21:39 -0700)]
Simpleperf: use ThreadTree when getting hit files in record command.
The new method is more accurate and has lower time complexity.
Bug:
22229391
Change-Id: I8b3016798b8a0e20335adeb7ec5dda0068044142
Yabin Cui [Fri, 24 Jul 2015 01:17:07 +0000 (01:17 +0000)]
am
47efd844: Merge "Simpleperf: separate ThreadTree from SampleTree."
* commit '
47efd84444cec06d79e2f53e4b2bb9a075b40e02':
Simpleperf: separate ThreadTree from SampleTree.
Yabin Cui [Fri, 24 Jul 2015 00:45:54 +0000 (00:45 +0000)]
Merge "Simpleperf: separate ThreadTree from SampleTree."
Yabin Cui [Thu, 23 Jul 2015 03:30:43 +0000 (20:30 -0700)]
Simpleperf: separate ThreadTree from SampleTree.
It is a preparation for unwinding in record command.
Bug:
22229391
Change-Id: I2f5c6df3f7332d4c98b61c7f9f922456b5bbeaaa
Yabin Cui [Tue, 21 Jul 2015 20:18:16 +0000 (20:18 +0000)]
am
defcf4e2: Merge "Simpleperf: load symbols from dso file only when necessary."
* commit '
defcf4e29e72c704e6aa19af8a88ab6e06735347':
Simpleperf: load symbols from dso file only when necessary.
Yabin Cui [Tue, 21 Jul 2015 19:18:57 +0000 (19:18 +0000)]
Merge "Simpleperf: load symbols from dso file only when necessary."
Yabin Cui [Tue, 21 Jul 2015 18:24:48 +0000 (11:24 -0700)]
Simpleperf: load symbols from dso file only when necessary.
Bug:
22630113
Change-Id: I12bb24ec02ba3ddb94bcb2a26ae2d6e7b445ed4d
Yabin Cui [Thu, 16 Jul 2015 20:55:16 +0000 (20:55 +0000)]
am
dece0f92: Merge "Simpleperf: dump thread comm/mmaps for selected threads."
* commit '
dece0f92f30bb6dbfd988907cda2bab15be2d732':
Simpleperf: dump thread comm/mmaps for selected threads.
Yabin Cui [Thu, 16 Jul 2015 20:26:35 +0000 (20:26 +0000)]
Merge "Simpleperf: dump thread comm/mmaps for selected threads."
Yabin Cui [Thu, 16 Jul 2015 17:20:55 +0000 (10:20 -0700)]
Simpleperf: dump thread comm/mmaps for selected threads.
Bug:
22511834
Change-Id: I2775b3a4cd393d75d5c6ebcd8a46e366ceb4ff76
Paul Lawrence [Thu, 16 Jul 2015 16:26:11 +0000 (16:26 +0000)]
am
9f441da9: am
dd22cb33: Actually encrypt stuff
* commit '
9f441da9d91298055cf9fd9ea7b4643aea33dd44':
Actually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 15:59:01 +0000 (15:59 +0000)]
am
dd22cb33: Actually encrypt stuff
* commit '
dd22cb338ad59a4766e9ee47936f1e10b386e128':
Actually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 14:54:52 +0000 (07:54 -0700)]
Actually encrypt stuff
Fix really dumb error in checkin
https://googleplex-android-review.git.corp.google.com/#/c/728542
This did the opposite of what I want
Bug:
22502319
Change-Id: I502c9b62d127e6221bbc5ff1a209cb0312ec943f
Paul Lawrence [Wed, 15 Jul 2015 23:48:22 +0000 (23:48 +0000)]
am
a0a0ebc5: am
65df483a: Don\'t encrypt lost+found
* commit '
a0a0ebc5bb1a009ecb4faac529fa2252568eda33':
Don't encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 23:13:24 +0000 (23:13 +0000)]
am
65df483a: Don\'t encrypt lost+found
* commit '
65df483af2efcb2ab9fd82ae53f9aeaa55f0cebd':
Don't encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 22:22:03 +0000 (15:22 -0700)]
Don't encrypt lost+found
ext4 encryption doesn't like it, and the kernel crashes.
Also fix a formatting error in logs.
Bug:
22478103
Change-Id: Ia25f4b0c1c9eeb20e39b795c7827c5bd1a11cb6a
Yabin Cui [Tue, 14 Jul 2015 20:27:29 +0000 (20:27 +0000)]
am
a209544b: Merge "Simpleperf: fix build on mac."
* commit '
a209544b63ca766af379337bd97ca19091f631c2':
Simpleperf: fix build on mac.
Yabin Cui [Tue, 14 Jul 2015 20:27:21 +0000 (20:27 +0000)]
am
98f391f3: Merge "Simpleperf: support --vmlinux option in report command."
* commit '
98f391f386b0b5e7bc57f77295e8edf848f5ff85':
Simpleperf: support --vmlinux option in report command.
Yabin Cui [Tue, 14 Jul 2015 20:27:20 +0000 (20:27 +0000)]
am
3fd76bc7: Merge "Simpleperf: fix build error on mips."
* commit '
3fd76bc71cef9dc49ec1b24bb0e2296f1d999e28':
Simpleperf: fix build error on mips.
Yabin Cui [Tue, 14 Jul 2015 20:27:15 +0000 (20:27 +0000)]
am
f1732eed: Merge "Simpleperf: Support dwarf callgraph recording."
* commit '
f1732eeda661c221ce52a1d9506e9e52db8bf377':
Simpleperf: Support dwarf callgraph recording.
Tao Bao [Tue, 14 Jul 2015 20:26:52 +0000 (20:26 +0000)]
am
dfff022d: Merge "ext4_utils: Wrap wipe.h to be C++ compatible."
* commit '
dfff022dd84587666909c518123b55a7f73accca':
ext4_utils: Wrap wipe.h to be C++ compatible.
Yabin Cui [Tue, 14 Jul 2015 17:14:18 +0000 (17:14 +0000)]
am
5e191823: am
96f2bc51: am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
5e191823c9d2e9e3309e24d63bc8d8058da3f9f7':
Simpleperf: remove abort in child process.
Yabin Cui [Tue, 14 Jul 2015 04:43:54 +0000 (04:43 +0000)]
Merge "Simpleperf: fix build on mac."
Yabin Cui [Tue, 14 Jul 2015 04:41:05 +0000 (21:41 -0700)]
Simpleperf: fix build on mac.
Change-Id: I042fa65347c38879ff9b9f1027b8ae39ec26da62
Yabin Cui [Tue, 14 Jul 2015 02:48:30 +0000 (02:48 +0000)]
Merge "Simpleperf: support --vmlinux option in report command."
Yabin Cui [Tue, 14 Jul 2015 02:47:40 +0000 (02:47 +0000)]
Merge "Simpleperf: fix build error on mips."
Yabin Cui [Tue, 14 Jul 2015 02:44:24 +0000 (19:44 -0700)]
Simpleperf: fix build error on mips.
Bug:
22229391
Change-Id: I3368da136277355e05045ee1203bb9a47036e94a
Yabin Cui [Mon, 13 Jul 2015 23:23:13 +0000 (16:23 -0700)]
Simpleperf: support --vmlinux option in report command.
Bug:
22179177
Change-Id: I633da55c6bfcb106d69de9bda6b44bce24ffca8e
Yabin Cui [Tue, 14 Jul 2015 02:08:23 +0000 (02:08 +0000)]
Merge "Simpleperf: Support dwarf callgraph recording."
Tao Bao [Tue, 14 Jul 2015 00:56:38 +0000 (00:56 +0000)]
Merge "ext4_utils: Wrap wipe.h to be C++ compatible."
Paul Crowley [Tue, 14 Jul 2015 00:28:00 +0000 (00:28 +0000)]
am
b8e5034a: am
fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-dev
* commit '
b8e5034ab0a3172d61af84842ebd123520c1137f':
Add keyctl_revoke
Improve error logging.
Paul Crowley [Tue, 14 Jul 2015 00:27:59 +0000 (00:27 +0000)]
am
7b5b1667: am
d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
* commit '
7b5b1667674453ae04474f853245a6a671066bd2':
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
Tao Bao [Mon, 13 Jul 2015 23:54:02 +0000 (16:54 -0700)]
ext4_utils: Wrap wipe.h to be C++ compatible.
Change-Id: Ieae03dd1afb9ef2028e8f4adaddbf8e9e09142f8
Yabin Cui [Mon, 13 Jul 2015 23:34:11 +0000 (23:34 +0000)]
am
96f2bc51: am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
96f2bc51002a59fb77711a2a38e014cf13ac010c':
Simpleperf: remove abort in child process.
Yabin Cui [Mon, 13 Jul 2015 19:23:54 +0000 (12:23 -0700)]
Simpleperf: Support dwarf callgraph recording.
1. add OS_RELEASE and ARCH feature in perf.data. ARCH feature is used when parsing
recorded user registers.
2. support `--call-graph dwarf` option in record command.
Bug:
22229391
Change-Id: I56dbdd101338658ce6a9b59aa8be90e712e007f5
Paul Crowley [Mon, 13 Jul 2015 22:35:00 +0000 (22:35 +0000)]
am
fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-dev
* commit '
fa584713c935572966cf86529bbba9e011e001e9':
Add keyctl_revoke
Improve error logging.
Paul Crowley [Mon, 13 Jul 2015 22:34:54 +0000 (22:34 +0000)]
am
d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
* commit '
d3548a38a524f6f5ccddd87f806054fbb71da434':
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
Yabin Cui [Mon, 13 Jul 2015 22:30:39 +0000 (22:30 +0000)]
am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
e7da7e9b27ca050a12efa36207ea6b9218cc684d':
Simpleperf: remove abort in child process.
Yabin Cui [Mon, 13 Jul 2015 21:25:06 +0000 (21:25 +0000)]
am
577974bd: Merge "Simpleperf: remove unnecessary std::move."
* commit '
577974bd2ca37f9915ea924d7d84e046aa05f482':
Simpleperf: remove unnecessary std::move.
Paul Crowley [Mon, 13 Jul 2015 21:11:20 +0000 (21:11 +0000)]
Merge changes If63f439d,I697ec4ef into mnc-dr-dev
* changes:
Add keyctl_revoke
Improve error logging.
Yabin Cui [Mon, 13 Jul 2015 21:01:34 +0000 (21:01 +0000)]
Merge "Simpleperf: remove unnecessary std::move."
Paul Crowley [Mon, 13 Jul 2015 20:52:27 +0000 (20:52 +0000)]
Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
Yabin Cui [Mon, 13 Jul 2015 19:44:21 +0000 (12:44 -0700)]
Simpleperf: remove unnecessary std::move.
Bug:
19483574
Change-Id: I2b49ded640c799058b448ddce7f92b5cecd86de3
Paul Crowley [Mon, 13 Jul 2015 15:55:55 +0000 (15:55 +0000)]
am
3b10d619: am
ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev
* commit '
3b10d6195ad6d147d32306f734a64e50a51bbccd':
Don't apply default encryption to /data/user, it should get per-user encryption.
Paul Crowley [Mon, 13 Jul 2015 15:11:35 +0000 (15:11 +0000)]
am
ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev
* commit '
ccaca5cb8971837afe96f5b2940d266a95efd564':
Don't apply default encryption to /data/user, it should get per-user encryption.
Paul Crowley [Sun, 12 Jul 2015 18:47:58 +0000 (18:47 +0000)]
Merge "Don't apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev
Andreas Gampe [Sat, 11 Jul 2015 07:06:31 +0000 (07:06 +0000)]
am
60bbb93d: Merge "Simpleperf: Fix unused parameter"
* commit '
60bbb93d988a5f797b316341b9447ca9ef011603':
Simpleperf: Fix unused parameter
Andreas Gampe [Sat, 11 Jul 2015 06:43:10 +0000 (06:43 +0000)]
Merge "Simpleperf: Fix unused parameter"
Andreas Gampe [Sat, 11 Jul 2015 06:41:07 +0000 (23:41 -0700)]
Simpleperf: Fix unused parameter
Fix mac build. Follow-up to
638c558339b7f1ae0ed95f64bcf7dbc5b238ed83.
Change-Id: I3065f2ac81db9992f9d4dba2d863402e0a600ee7
Yabin Cui [Sat, 11 Jul 2015 02:04:06 +0000 (02:04 +0000)]
am
13dedc6a: Merge "Simpleperf: check build id in report command."
* commit '
13dedc6a7970837fbf85e3a80933207176c9562a':
Simpleperf: check build id in report command.
Yabin Cui [Sat, 11 Jul 2015 01:46:19 +0000 (01:46 +0000)]
Merge "Simpleperf: check build id in report command."
Yabin Cui [Sat, 11 Jul 2015 01:02:01 +0000 (18:02 -0700)]
Simpleperf: remove abort in child process.
Bug:
22328419
Change-Id: I3521a246929c10dc1eb9c9dac75240197b5b0a40
Thierry Strudel [Fri, 10 Jul 2015 19:26:21 +0000 (19:26 +0000)]
am
830175fa: am
b89e81dc: fs_config: align with new explicit fs_config target_out parameter
* commit '
830175fa76fea6dff1fc2e79adebfb515b9da993':
fs_config: align with new explicit fs_config target_out parameter
Thierry Strudel [Fri, 10 Jul 2015 18:57:34 +0000 (18:57 +0000)]
am
b89e81dc: fs_config: align with new explicit fs_config target_out parameter
* commit '
b89e81dcb9bfa707912d9e370949b250367b0998':
fs_config: align with new explicit fs_config target_out parameter
Thierry Strudel [Thu, 9 Jul 2015 23:31:39 +0000 (16:31 -0700)]
fs_config: align with new explicit fs_config target_out parameter
Bug:
21989305
Bug:
22048934
Change-Id: I82c16c70a776e13b3365672b2820ee965525de9a
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Paul Crowley [Mon, 6 Jul 2015 15:54:28 +0000 (16:54 +0100)]
Add keyctl_revoke
Change-Id: If63f439d831aa384acd45fde98312923f9c2e561
Paul Crowley [Thu, 28 May 2015 15:45:52 +0000 (16:45 +0100)]
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
Bug:
19704432
(cherry picked from commit
09d3fdffad0ccbed36f0ece966e85aed23c626d7)
Change-Id: Ib7ef9365063ed69774169b22071f2a42d2f5ef21
Paul Crowley [Thu, 28 May 2015 15:45:52 +0000 (16:45 +0100)]
Improve error logging.
Bug:
19704432
Change-Id: I697ec4ef879b522d073e5eacc49665479f082ae9
Paul Crowley [Wed, 6 May 2015 14:28:35 +0000 (15:28 +0100)]
Don't apply default encryption to /data/user, it should get per-user
encryption.
Bug:
19704432
(cherry-picked from commit
0050336a0a19019a68374b9eef51e00d6b242f57)
Change-Id: I646f3408ccc06f580d62a2f90f7b895288585396
Zhengyin Qian [Tue, 7 Jul 2015 18:20:24 +0000 (18:20 +0000)]
am
f799c165: am
b1f954d1: Merge "Add a system tool - ANRdaemon" into cw-d-mr1-dev
* commit '
f799c16539e98ae4ed3415db7b0cd39d478ecbae':
Add a system tool - ANRdaemon
Zhengyin Qian [Tue, 7 Jul 2015 17:57:25 +0000 (17:57 +0000)]
am
b1f954d1: Merge "Add a system tool - ANRdaemon" into cw-d-mr1-dev
* commit '
b1f954d105a4604487194be94233dd7b8d049d51':
Add a system tool - ANRdaemon
Zhengyin Qian [Tue, 7 Jul 2015 17:19:34 +0000 (17:19 +0000)]
Merge "Add a system tool - ANRdaemon" into cw-d-mr1-dev
Zhengyin Qian [Fri, 19 Jun 2015 04:37:41 +0000 (21:37 -0700)]
Add a system tool - ANRdaemon
This is a daemon to help analyze ANR due to CPU starvation by logging system activity before such an event happens. The daemon uses debugfs underlying for logging.
Change-Id: I5c7c78e88e1dda9c392502f2a41d1e47f06bb89b
Yabin Cui [Wed, 1 Jul 2015 23:16:57 +0000 (16:16 -0700)]
Simpleperf: check build id in report command.
1. refactor BuildId type.
2. check build id before parsing symbols in report command.
Bug:
22179177
Change-Id: Iefc797a88d4a168e109db786105120c8d6914369
Erik Kline [Sat, 4 Jul 2015 02:57:26 +0000 (02:57 +0000)]
am
d7620bab: Merge "Require optimistic behaviour to pass srcaddr_selection_test"
* commit '
d7620bab199e53821a707c513500bba1ca7f55da':
Require optimistic behaviour to pass srcaddr_selection_test
Yabin Cui [Sat, 4 Jul 2015 02:57:24 +0000 (02:57 +0000)]
am
ab5a4c3c: Merge "Simpleperf: support callgraph option in report command."
* commit '
ab5a4c3c4bb4cd07561e8dd94e786f2850498df8':
Simpleperf: support callgraph option in report command.
Yabin Cui [Sat, 4 Jul 2015 02:57:23 +0000 (02:57 +0000)]
am
95f485d6: Merge "Simpleperf: add --log option to ease debugging."
* commit '
95f485d6daefac03fc8cfed928b70fe0f84e9a27':
Simpleperf: add --log option to ease debugging.
Erik Kline [Thu, 2 Jul 2015 07:11:37 +0000 (07:11 +0000)]
Merge "Require optimistic behaviour to pass srcaddr_selection_test"
Erik Kline [Thu, 2 Jul 2015 06:35:51 +0000 (15:35 +0900)]
Require optimistic behaviour to pass srcaddr_selection_test
Change-Id: I612a8e1427d976c154529540b89b9db3da2b25d5
Yabin Cui [Thu, 2 Jul 2015 03:36:53 +0000 (03:36 +0000)]
Merge "Simpleperf: support callgraph option in report command."
Yabin Cui [Thu, 2 Jul 2015 03:35:11 +0000 (03:35 +0000)]
Merge "Simpleperf: add --log option to ease debugging."
Yabin Cui [Wed, 1 Jul 2015 01:03:34 +0000 (18:03 -0700)]
Simpleperf: add --log option to ease debugging.
Bug:
19483574
Change-Id: If45bbefb79b488206ca7542957f4207c3420fce3
Yabin Cui [Wed, 1 Jul 2015 17:00:52 +0000 (10:00 -0700)]
Simpleperf: support callgraph option in report command.
Bug:
19483574
Change-Id: I7c5558a71ea15650c1d3e7afa268b3fbc11543d7
Lorenzo Colitti [Wed, 1 Jul 2015 06:14:30 +0000 (06:14 +0000)]
am
5e007c3d: Merge "Add a test for repeated neighbour probes."
* commit '
5e007c3d699d6509cc88865b40dfc0c5eda36bfa':
Add a test for repeated neighbour probes.
Lorenzo Colitti [Wed, 1 Jul 2015 06:14:29 +0000 (06:14 +0000)]
am
1c9d33f8: Merge "Add a test for ND cache behaviour."
* commit '
1c9d33f85fe9365c62cd0c224fde19b4d31d9d03':
Add a test for ND cache behaviour.
Lorenzo Colitti [Wed, 1 Jul 2015 05:52:22 +0000 (05:52 +0000)]
Merge "Add a test for repeated neighbour probes."
Lorenzo Colitti [Wed, 1 Jul 2015 05:49:28 +0000 (05:49 +0000)]
Merge "Add a test for ND cache behaviour."
Lorenzo Colitti [Wed, 1 Jul 2015 04:45:35 +0000 (13:45 +0900)]
Add a test for repeated neighbour probes.
Bug:
21909622
Change-Id: Ie0581da732f330f1b7b6a1cab15fcc8fdeb4203d
Lorenzo Colitti [Tue, 30 Jun 2015 08:21:00 +0000 (17:21 +0900)]
Add a test for ND cache behaviour.
Bug:
21909622
Change-Id: I2c38b6220ac8d021785901d775f23ad30aa38242
Yabin Cui [Wed, 1 Jul 2015 01:39:05 +0000 (01:39 +0000)]
am
b36f72ec: Merge "Simpleperf: support --children option in report command."
* commit '
b36f72ec4b30b7926c03c42b1f1feb089f462160':
Simpleperf: support --children option in report command.
Yabin Cui [Wed, 1 Jul 2015 01:16:40 +0000 (01:16 +0000)]
Merge "Simpleperf: support --children option in report command."
Yabin Cui [Tue, 30 Jun 2015 01:19:46 +0000 (18:19 -0700)]
Simpleperf: support --children option in report command.
1. Refactor code about managing report items.
2. support --children option. It is a preparation to support -g option.
Bug:
19483574
Change-Id: Iba4dc0895c48a9fa1937aed165d7b3a2dc8e5c71
Lorenzo Colitti [Tue, 30 Jun 2015 08:00:27 +0000 (08:00 +0000)]
am
d3552252: Merge "Add a unit test for the IPV6_JOIN_ANYCAST hang."
* commit '
d3552252fe68bcf5e5bf66001898c81caae813e8':
Add a unit test for the IPV6_JOIN_ANYCAST hang.
Lorenzo Colitti [Tue, 30 Jun 2015 07:36:41 +0000 (07:36 +0000)]
Merge "Add a unit test for the IPV6_JOIN_ANYCAST hang."
Lorenzo Colitti [Tue, 30 Jun 2015 04:01:37 +0000 (13:01 +0900)]
Add a unit test for the IPV6_JOIN_ANYCAST hang.
Bug:
18902601
Change-Id: I67cff7954498b9bf2950a34b583be43fd21d6005
Yabin Cui [Mon, 29 Jun 2015 23:13:18 +0000 (23:13 +0000)]
am
f22d1e19: Merge "Simpleperf: support build on mac."
* commit '
f22d1e19ba23152486b64b7c178fb35090de68a9':
Simpleperf: support build on mac.
Yabin Cui [Mon, 29 Jun 2015 22:48:43 +0000 (22:48 +0000)]
Merge "Simpleperf: support build on mac."
Yabin Cui [Fri, 26 Jun 2015 00:42:23 +0000 (17:42 -0700)]
Simpleperf: support build on mac.
Bug:
19483574
Change-Id: I6c28541944bc0a4e6fc07d7ea5a8fb5f71890510
Yabin Cui [Mon, 29 Jun 2015 17:23:19 +0000 (17:23 +0000)]
am
b54b4cdf: Merge "Simpleperf: don\'t use designation in struct member initialization."
* commit '
b54b4cdf42d26916dac3c116f19a96cd555c515a':
Simpleperf: don't use designation in struct member initialization.
Yabin Cui [Mon, 29 Jun 2015 17:02:42 +0000 (17:02 +0000)]
Merge "Simpleperf: don't use designation in struct member initialization."
Sami Tolvanen [Fri, 26 Jun 2015 17:02:27 +0000 (17:02 +0000)]
am
2617755d: Merge "squashfs_utils: fix build on Mac"
* commit '
2617755d2d8feb850215ec9d665a8e3697820808':
squashfs_utils: fix build on Mac
Sami Tolvanen [Fri, 26 Jun 2015 16:42:18 +0000 (16:42 +0000)]
Merge "squashfs_utils: fix build on Mac"
Sami Tolvanen [Fri, 26 Jun 2015 16:37:11 +0000 (17:37 +0100)]
squashfs_utils: fix build on Mac
Mac's libc doesn't define TEMP_FAILURE_RETRY. Include a definition
from libcutils.
Change-Id: I72c67d17614f79964fd684fd728242bee3e0599c
Sami Tolvanen [Fri, 26 Jun 2015 15:46:55 +0000 (15:46 +0000)]
am
7c1b98d4: Merge "squashfs_utils: Add host library and parsing from buffer"
* commit '
7c1b98d4666f42c238954093f4b946e8e28a84a6':
squashfs_utils: Add host library and parsing from buffer
Sami Tolvanen [Fri, 26 Jun 2015 15:25:20 +0000 (15:25 +0000)]
Merge "squashfs_utils: Add host library and parsing from buffer"
OSDN Git Service
