OSDN Git Service
Sami Tolvanen [Thu, 17 Sep 2015 10:38:20 +0000 (10:38 +0000)]
am
510ade28: Merge "boot_signer: allow verification using an external certificate"
* commit '
510ade28faa0a940965dc2d379c42fa45cdea395':
boot_signer: allow verification using an external certificate
Sami Tolvanen [Thu, 17 Sep 2015 10:31:11 +0000 (10:31 +0000)]
Merge "boot_signer: allow verification using an external certificate"
Christopher Ferris [Tue, 15 Sep 2015 23:47:24 +0000 (23:47 +0000)]
am
35a68e69: Merge "Fix mac build."
* commit '
35a68e69ce08e2d6c2c4696330b0cf918e167559':
Fix mac build.
Christopher Ferris [Tue, 15 Sep 2015 23:29:05 +0000 (23:29 +0000)]
Merge "Fix mac build."
Christopher Ferris [Tue, 15 Sep 2015 23:26:21 +0000 (16:26 -0700)]
Fix mac build.
This disables the host code and host tests on anything but a linux
system.
Change-Id: I1a6396707df216e1c22de537072b10221fcc7fce
Christopher Ferris [Tue, 15 Sep 2015 23:15:55 +0000 (23:15 +0000)]
am
168437c1: Merge "Tool to replay memory allocation recordings."
* commit '
168437c1ae6cd7fcbad344582efd6a5cfe660ff0':
Tool to replay memory allocation recordings.
Christopher Ferris [Tue, 15 Sep 2015 23:04:08 +0000 (23:04 +0000)]
Merge "Tool to replay memory allocation recordings."
Christopher Ferris [Fri, 11 Sep 2015 22:34:23 +0000 (15:34 -0700)]
Tool to replay memory allocation recordings.
Included with the tool are a set of app memory recordings that
can be used to judge the abilities of the native memory
allocator.
Verified the full flow by running valgrind on the host version on all
the current dumps and verifying that there are no leak, and no errors.
Change-Id: I756224991f04b61ba26c692a30a37aad0c9fb163
Sami Tolvanen [Tue, 15 Sep 2015 09:41:16 +0000 (10:41 +0100)]
boot_signer: allow verification using an external certificate
Add a -certificate parameter, which allows one to specify an external
public key certificate to use for verifying boot image signatures:
boot_signer -verify boot.img -certificate cert.x509.pem
This makes it possible to confirm that the boot image has been signed
with a specific key.
Change-Id: I41f1a05e1c8be3bfac2a86678d81beaae0e371bb
Colin Cross [Mon, 14 Sep 2015 18:03:04 +0000 (18:03 +0000)]
am
12f454e2: Merge changes I7dc2edd4,I419b2ec0
* commit '
12f454e24a518d81fe42043b7142582b81694363':
iotop: add total read/write stats
iotop: fix bytes per second, and add accumulation
Colin Cross [Mon, 14 Sep 2015 17:55:58 +0000 (17:55 +0000)]
Merge changes I7dc2edd4,I419b2ec0
* changes:
iotop: add total read/write stats
iotop: fix bytes per second, and add accumulation
Than McIntosh [Wed, 9 Sep 2015 15:25:27 +0000 (15:25 +0000)]
am
59d3e1db: Merge "Support for additional profile annotations."
* commit '
59d3e1db25839547fc7e713d3c86d3329833aabc':
Support for additional profile annotations.
Than McIntosh [Wed, 9 Sep 2015 15:20:17 +0000 (15:20 +0000)]
Merge "Support for additional profile annotations."
Colin Cross [Wed, 9 Sep 2015 00:09:22 +0000 (17:09 -0700)]
iotop: add total read/write stats
Provide total read, write, and read/write stats across all threads
or processes.
Change-Id: I7dc2edd45681b6a54f67347337c76deb1342dc95
Colin Cross [Tue, 8 Sep 2015 22:04:22 +0000 (15:04 -0700)]
iotop: fix bytes per second, and add accumulation
Bytes per second forgot to divide bytes by seconds. Also add
the -a flag to print bytes instead of bytes per second.
Change-Id: I419b2ec0f702a291d299fe736d2d4ab290c03445
David Zeuthen [Tue, 8 Sep 2015 19:14:30 +0000 (19:14 +0000)]
am
bd827df0: Merge "boot_control_copy: A boot_control HAL implementation that works by copying."
* commit '
bd827df07c44464767c45da538294d42a1a0c103':
boot_control_copy: A boot_control HAL implementation that works by copying.
David Zeuthen [Tue, 8 Sep 2015 19:09:04 +0000 (19:09 +0000)]
Merge "boot_control_copy: A boot_control HAL implementation that works by copying."
Than McIntosh [Thu, 3 Sep 2015 19:16:04 +0000 (15:16 -0400)]
Support for additional profile annotations.
Includes "device booting", "on charger", and cpu utilization.
Prototype version of "camera active" (not yet enabled). Also in
this patch, separate out the code to read perfprofd's config
file and place into a separate source file.
Change-Id: I04d65c406fd41f26a509983f08658991e8f1d422
Lorenzo Colitti [Sun, 6 Sep 2015 11:17:39 +0000 (11:17 +0000)]
am
a2b2d811: Merge "Annotate a few tests with the relevant kernel commits."
* commit '
a2b2d8119cb8a3377ad3addc2623e56479f6a001':
Annotate a few tests with the relevant kernel commits.
Lorenzo Colitti [Sun, 6 Sep 2015 11:11:58 +0000 (11:11 +0000)]
Merge "Annotate a few tests with the relevant kernel commits."
Colin Cross [Sat, 5 Sep 2015 19:38:42 +0000 (19:38 +0000)]
am
a0370d7b: Merge "Implement iotop"
* commit '
a0370d7bfea440286c3b4df3253e632377ecc326':
Implement iotop
Colin Cross [Sat, 5 Sep 2015 19:31:52 +0000 (19:31 +0000)]
Merge "Implement iotop"
Colin Cross [Fri, 4 Sep 2015 00:56:39 +0000 (17:56 -0700)]
Implement iotop
iotop provides per process statistics on IO rates and kernel delays.
Requires root, and a kernel compiled with CONFIG_TASKSTATS,
CONFIG_TASK_DELAY_ACCT, and CONFIG_TASK_IO_ACCOUNTING.
Change-Id: I111c55a1492e9ea33d8d7b3ab620080625b84346
Filipe Brandenburger [Fri, 4 Sep 2015 05:48:27 +0000 (05:48 +0000)]
am
b57eb67b: Merge "Expect a notification for NUD_REACHABLE."
* commit '
b57eb67b373f9d2ba27d9ca7d75c27e4c245c687':
Expect a notification for NUD_REACHABLE.
Filipe Brandenburger [Fri, 4 Sep 2015 05:39:35 +0000 (05:39 +0000)]
Merge "Expect a notification for NUD_REACHABLE."
Filipe Brandenburger [Thu, 3 Sep 2015 22:11:13 +0000 (15:11 -0700)]
Expect a notification for NUD_REACHABLE.
This is necessary when running on kernel v3.13+ which includes commit
53385d2 "neigh: Netlink notification for administrative NUD state change"
BUG=chrome-os-partner:43435
TEST=Ran successfully on chromeos-3.18 kernels, android-3.10 unaffected.
Change-Id: I365ba5b8762776156a8a942975286e1c92734277
David Zeuthen [Tue, 1 Sep 2015 18:58:36 +0000 (14:58 -0400)]
boot_control_copy: A boot_control HAL implementation that works by copying.
This boot_control HAL implementation emulates A/B by copying the
contents of the boot partition of the requested slot to the boot
partition. It hence works with bootloaders that are not yet aware of
A/B. This code is only intended to be used for development.
Change-Id: Ifcc1ff19530f9e6db1de882807a25c785e1959de
Lorenzo Colitti [Tue, 1 Sep 2015 04:42:56 +0000 (13:42 +0900)]
Annotate a few tests with the relevant kernel commits.
Also fix a couple of lint warnings, a few spurious newlines, and
a syntax error in currently-unused debug code.
Change-Id: I192eb730d48443ee050ca7702bc3735cd6ff6553
Kenny Root [Thu, 3 Sep 2015 00:32:23 +0000 (00:32 +0000)]
am
65fd650a: Merge "Prepare for BoringSSL update."
* commit '
65fd650a4ae3d8602bffc0fa469695228209e38b':
Prepare for BoringSSL update.
Kenny Root [Wed, 2 Sep 2015 23:03:30 +0000 (23:03 +0000)]
Merge "Prepare for BoringSSL update."
Adam Langley [Wed, 2 Sep 2015 22:45:12 +0000 (15:45 -0700)]
Prepare for BoringSSL update.
This change tweaks things as needed so that the code will compile
against both the BoringSSL that's currently in Android and a version
from upstream. The BORINGSSL_201509 define is temporary to allow the
switch to happen without breaking the build and a followup change will
remove it.
In this case, we backed off on removing |ERR_print_errors|, despite it
being a wart in the layering of the code.
Change-Id: I2f2f567cfc37fe2d5a69742302c5a92d289b814f
Colin Cross [Wed, 2 Sep 2015 17:38:18 +0000 (17:38 +0000)]
am
32802ecf: Merge "Fix taskstats for libnl"
* commit '
32802ecf57a6047f7008f9be8ba5072b9d458e57':
Fix taskstats for libnl
Colin Cross [Wed, 2 Sep 2015 17:30:31 +0000 (17:30 +0000)]
Merge "Fix taskstats for libnl"
Colin Cross [Wed, 2 Sep 2015 06:24:13 +0000 (23:24 -0700)]
Fix taskstats for libnl
taskstats doesn't work, probably caused by when I switched it from
using system/core/libnl_2 to external/libnl. Fix a few bugs that
libnl_2 didn't care about:
- callbacks must be registered with NL_CB_CUSTOM
- nla_next is not guaranteed to work if !nla_ok, use nla_for_each_attr
which does the right thing
- instead of fixing get_family_id, use genl_ctrl_resolve
- instead of manually setting pid, seq, and flags, use
nl_send_auto_complete
- since there is now only one command sent, get rid of send_command
and take advantage of the known parameter type to use nla_put_u32
- libnl does not set errno, return nl error codes and use nl_perror
instead of perror
Change-Id: Ic631c8c1d9cc6ed288cbbeb6fe40c45ca5fe9143
David Zeuthen [Tue, 1 Sep 2015 20:50:12 +0000 (20:50 +0000)]
am
d36de04a: Merge "bootctl: Command-line wrapper for boot_control HAL."
* commit '
d36de04aaa52bb66bf9e4470b7ed4d6cfc88aaeb':
bootctl: Command-line wrapper for boot_control HAL.
David Zeuthen [Tue, 1 Sep 2015 20:42:47 +0000 (20:42 +0000)]
Merge "bootctl: Command-line wrapper for boot_control HAL."
Lorenzo Colitti [Tue, 1 Sep 2015 16:37:46 +0000 (16:37 +0000)]
am
3cd19a8a: Merge "Add a millisecond-variant of MonitorSleep."
* commit '
3cd19a8a924dfd17606247c1f7445765f19a5f25':
Add a millisecond-variant of MonitorSleep.
Dan Willemsen [Tue, 1 Sep 2015 16:37:43 +0000 (16:37 +0000)]
am
b4e51e4e: Merge "Remove HOST_OS checks, whitelist windows module"
* commit '
b4e51e4eeca613d3f1979864ebe4d220f3ee8f10':
Remove HOST_OS checks, whitelist windows module
Lorenzo Colitti [Tue, 1 Sep 2015 10:50:27 +0000 (10:50 +0000)]
Merge "Add a millisecond-variant of MonitorSleep."
Lorenzo Colitti [Tue, 1 Sep 2015 04:42:31 +0000 (13:42 +0900)]
Add a millisecond-variant of MonitorSleep.
This is only used for debugging.
Change-Id: I1e00ff476f99b3a0d30658933f24b5a11ca0710a
Dan Willemsen [Tue, 1 Sep 2015 00:46:48 +0000 (00:46 +0000)]
Merge "Remove HOST_OS checks, whitelist windows module"
David Zeuthen [Mon, 31 Aug 2015 21:55:33 +0000 (17:55 -0400)]
bootctl: Command-line wrapper for boot_control HAL.
Change-Id: Icd7bfee8fcc04ca113c2e6dc8bcefd614e804bb6
Dan Willemsen [Tue, 18 Aug 2015 23:56:12 +0000 (16:56 -0700)]
Remove HOST_OS checks, whitelist windows module
This doesn't remove the HOST_OS checks later in the file, those can be
removed once LOCAL_MODULE_HOST_OS is enforced.
Bug:
23566667
Change-Id: I0032022b470bcc8d5546ed6f8dbd99e3d0cf3db5
Gopinath [Wed, 26 Aug 2015 17:07:24 +0000 (17:07 +0000)]
am
c7d19e4d: Adding 64 bit emmc_rand_perf
* commit '
c7d19e4da5e54231a54abf31afdc4531114a184b':
Adding 64 bit emmc_rand_perf
Gopinath [Tue, 25 Aug 2015 23:16:09 +0000 (16:16 -0700)]
Adding 64 bit emmc_rand_perf
Genrating 32bit and 64bit variant in local/tmp
Change-Id: Ia9a640eab5bfc428d00af4ae0ada6184d946108a
Mark Salyzyn [Mon, 24 Aug 2015 17:23:30 +0000 (17:23 +0000)]
am
44df7549: Merge "fix bug in mkf2fs tool calculation of f2fs filesystem length"
* commit '
44df7549d622456c3f18e371ec57dbf585a68a1b':
fix bug in mkf2fs tool calculation of f2fs filesystem length
Mark Salyzyn [Mon, 24 Aug 2015 17:08:11 +0000 (17:08 +0000)]
Merge "fix bug in mkf2fs tool calculation of f2fs filesystem length"
lei wang wang [Mon, 24 Aug 2015 07:47:36 +0000 (15:47 +0800)]
fix bug in mkf2fs tool calculation of f2fs filesystem length
Yabin Cui [Sat, 22 Aug 2015 00:06:00 +0000 (00:06 +0000)]
am
bea942d7: Merge "Simpleperf: use OneTimeFreeAllocator to allocate symbol names."
* commit '
bea942d7f32002f90b42a8f5b28a774e5b6cb4c7':
Simpleperf: use OneTimeFreeAllocator to allocate symbol names.
Yabin Cui [Fri, 21 Aug 2015 23:52:29 +0000 (23:52 +0000)]
Merge "Simpleperf: use OneTimeFreeAllocator to allocate symbol names."
Yabin Cui [Fri, 21 Aug 2015 21:23:43 +0000 (14:23 -0700)]
Simpleperf: use OneTimeFreeAllocator to allocate symbol names.
simpleperf report takes a lot of time mallocing and freeing memory.
This change reduces the time to free memory.
Before this change:
$sudo simpleperf stat simpleperf report
Performance counter statistics:
3,258,481,203 cpu-cycles # 2.290946 GHz (80%)
4,147,660,154 instructions # 0.785619 cycles per instruction (79%)
Total test time: 1.422330 seconds.
After this change:
$sudo simpleperf stat simpleperf report
Performance counter statistics:
1,699,221,386 cpu-cycles # 2.994754 GHz (79%)
2,739,945,156 instructions # 0.620166 cycles per instruction (81%)
Total test time: 0.567399 seconds.
This change also fix a bug in record_file_test.cpp.
Bug:
23387541
Change-Id: I59fc86ca54a6c09bd08eec8ada931ccff88d3102
Yabin Cui [Fri, 21 Aug 2015 22:24:28 +0000 (22:24 +0000)]
am
bb86cc8c: Merge "Simpleperf: refactor dso."
* commit '
bb86cc8c6ac869044c3811c59616e01255c983d3':
Simpleperf: refactor dso.
Yabin Cui [Fri, 21 Aug 2015 20:25:39 +0000 (20:25 +0000)]
Merge "Simpleperf: refactor dso."
Yabin Cui [Thu, 20 Aug 2015 22:04:39 +0000 (15:04 -0700)]
Simpleperf: refactor dso.
Having DsoEntry and DsoFactory confuses me which part code should belong to.
This change merges the two into class Dso and makes things clear.
It is also a preparation for performance optimization in Dso.
Bug:
23387541
Change-Id: I41e773406a7f1582a11a18859df252ce8ea3acfa
Tom Cherry [Fri, 21 Aug 2015 18:20:33 +0000 (18:20 +0000)]
am
4c5b176c: Merge "bundle init.rc contents with its service"
* commit '
4c5b176c252d2620086c688ef4384a10ad0eedaa':
bundle init.rc contents with its service
Tom Cherry [Fri, 21 Aug 2015 17:42:32 +0000 (17:42 +0000)]
Merge "bundle init.rc contents with its service"
Yabin Cui [Fri, 21 Aug 2015 03:30:38 +0000 (03:30 +0000)]
am
68cb694f: Merge "Simpleperf: support multiple event types in record command."
* commit '
68cb694f4f2221b20c9a74a496a82b1043ac2016':
Simpleperf: support multiple event types in record command.
Yabin Cui [Fri, 21 Aug 2015 03:20:08 +0000 (03:20 +0000)]
Merge "Simpleperf: support multiple event types in record command."
Yabin Cui [Thu, 20 Aug 2015 19:31:47 +0000 (19:31 +0000)]
am
b84ee6cd: Merge "Simpleperf: improve output of stat command."
* commit '
b84ee6cd81da6a0929035c589f1c0450e8d10902':
Simpleperf: improve output of stat command.
Yabin Cui [Wed, 19 Aug 2015 22:46:51 +0000 (15:46 -0700)]
Simpleperf: support multiple event types in record command.
Change-Id: I0aa0e8c9491370b5e4fafdaf8cdc5613c26c78f5
Yabin Cui [Thu, 20 Aug 2015 02:03:29 +0000 (02:03 +0000)]
Merge "Simpleperf: improve output of stat command."
Tom Cherry [Fri, 14 Aug 2015 20:06:21 +0000 (13:06 -0700)]
bundle init.rc contents with its service
Bug:
23186545
Change-Id: I29e6f1e6e404838c7b57a736012a28d4d60f951a
Yabin Cui [Wed, 19 Aug 2015 22:01:12 +0000 (15:01 -0700)]
Simpleperf: improve output of stat command.
Before this change:
$sudo simpleperf record -a sleep 1
Performance counter statistics:
5994649915(scaled) cpu-cycles
8785461570(scaled) stalled-cycles-frontend
6089237592(scaled) instructions
1086987265(scaled) branch-instructions
11019426(scaled) branch-misses
40306210522 task-clock
21955 context-switches
16659 page-faults
Total test time: 1.007973 seconds.
After this change:
$sudo simpleperf record -a sleep 1
Performance counter statistics:
11,768,763,985 cpu-cycles # 11.675808 Ghz (83%)
16,142,943,081 stalled-cycles-frontend # 16.015 G/sec (67%)
17,286,201,730 instructions # 0.680818 cycles per instruction (83%)
3,141,529,369 branch-instructions # 3.117 G/sec (84%)
18,168,963 branch-misses # 0.578348% miss rate (83%)
40222.432118(ms) task-clock # 3990.473223% cpu usage (100%)
19,240 context-switches # 19.088 K/sec (100%)
9,302 page-faults # 9.229 K/sec (100%)
Total test time: 1.007961 seconds.
Change-Id: I5590699957650e246b14b3d2b405108483631908
Yabin Cui [Wed, 19 Aug 2015 22:31:12 +0000 (22:31 +0000)]
am
5f0c337d: Merge "Simpleperf: add raw data in sample records for tracepoint events."
* commit '
5f0c337dfa35d575585ab6c1789f196e94ab0488':
Simpleperf: add raw data in sample records for tracepoint events.
Yusuke Sato [Wed, 19 Aug 2015 22:31:08 +0000 (22:31 +0000)]
am
25d34e2a: Merge "Use the new version of android_fork_execvp_ext()"
* commit '
25d34e2af21e7a34f01eef25df94be73995cb7fc':
Use the new version of android_fork_execvp_ext()
Yabin Cui [Wed, 19 Aug 2015 22:10:22 +0000 (22:10 +0000)]
Merge "Simpleperf: add raw data in sample records for tracepoint events."
Yusuke Sato [Wed, 19 Aug 2015 20:23:43 +0000 (20:23 +0000)]
Merge "Use the new version of android_fork_execvp_ext()"
Yabin Cui [Wed, 19 Aug 2015 17:12:51 +0000 (10:12 -0700)]
Simpleperf: add raw data in sample records for tracepoint events.
tracepoint events store tracing info in raw data in sample records.
And we need to enable it in sample_type.
Change-Id: Icd866059f4703b56724845d7526ae58099e83113
Yusuke Sato [Tue, 18 Aug 2015 19:10:45 +0000 (12:10 -0700)]
Use the new version of android_fork_execvp_ext()
This CL depends on I818f5cf61045286c8d64a91b6d50f05740329be1.
Bug:
21725996
Change-Id: I2d26cf79989de717b7695757d0297a16dedbebbd
Yabin Cui [Wed, 19 Aug 2015 02:59:17 +0000 (02:59 +0000)]
am
3c599ffc: Merge "Simpleperf: demangle symbols only when necessary."
* commit '
3c599ffc9954dd25f0f3ad012189f825afd89449':
Simpleperf: demangle symbols only when necessary.
Yabin Cui [Wed, 19 Aug 2015 02:47:33 +0000 (02:47 +0000)]
Merge "Simpleperf: demangle symbols only when necessary."
Yabin Cui [Tue, 18 Aug 2015 23:32:18 +0000 (16:32 -0700)]
Simpleperf: demangle symbols only when necessary.
Before this change:
$sudo simpleperf record -a sleep 1
$sudo simpleperf stat simpleperf report
Total test time: 4.088779 seconds.
After this change:
$sudo simpleperf record -a sleep 1
$sudo simpleperf stat simpleperf report
Total test time: 1.226267 seconds.
Change-Id: Ifc811f432ac69f770eeb5814e4983f6f19dbc909
Riley Andrews [Tue, 18 Aug 2015 19:32:06 +0000 (19:32 +0000)]
am
2c0f9f26: Merge "Add memcpy perf test + graphing script."
* commit '
2c0f9f263cd6c3857850c7d3a8f2aabb63ce48be':
Add memcpy perf test + graphing script.
Riley Andrews [Tue, 18 Aug 2015 19:17:30 +0000 (19:17 +0000)]
Merge "Add memcpy perf test + graphing script."
Riley Andrews [Mon, 17 Aug 2015 23:42:26 +0000 (16:42 -0700)]
Add memcpy perf test + graphing script.
Change-Id: Iaaac90f4d91dbe6023b64af6e8924f6b9f61e58b
Andreas Gampe [Thu, 6 Aug 2015 00:16:22 +0000 (17:16 -0700)]
Ext4utils: Fix unused parameters
Refactor code so that parameters are not unused and the debug code
is always at least checked (and in non-debug cases compiled away).
Bug:
18632512
(cherry picked from commit
7ec740fee7356dd72918c9b9fd0a91276356673b)
Change-Id: I0e1eedae97a6edceb1771e10e6ec82c641ba9c5e
Dan Albert [Wed, 12 Aug 2015 02:05:09 +0000 (02:05 +0000)]
am
89a2254a: Merge "Add missing include."
* commit '
89a2254abae3f427aa85fb3a3afe9a27cdfad68d':
Add missing include.
Dan Albert [Wed, 12 Aug 2015 01:49:40 +0000 (01:49 +0000)]
Merge "Add missing include."
Dan Albert [Wed, 12 Aug 2015 01:36:20 +0000 (18:36 -0700)]
Add missing include.
Used to be transitively included by libc++.
Change-Id: I07497ccc9bbcf3370b065876d91aed760c5f6118
Dan Albert [Tue, 11 Aug 2015 23:30:05 +0000 (23:30 +0000)]
am
587fc682: Merge "Add missing includes for pid_t."
* commit '
587fc682ec1e81c400cd61f742bf8a0a26343425':
Add missing includes for pid_t.
Dan Albert [Tue, 11 Aug 2015 23:11:03 +0000 (23:11 +0000)]
Merge "Add missing includes for pid_t."
Dan Albert [Tue, 11 Aug 2015 22:59:43 +0000 (15:59 -0700)]
Add missing includes for pid_t.
Was being transitively included through libc++, but the libc++ update
fixes some of the leaky headers (used to always include unistd.h!).
Change-Id: I40caf74695bb75901bda24665b8d83a6914de9c4
Elliott Hughes [Mon, 10 Aug 2015 23:04:53 +0000 (23:04 +0000)]
am
31d0d7cb: Merge "Add <endian.h> back and stop building one tool for the Mac."
* commit '
31d0d7cbc1f4ed6a9295dd326104b8071478f924':
Add <endian.h> back and stop building one tool for the Mac.
Elliott Hughes [Mon, 10 Aug 2015 22:53:27 +0000 (22:53 +0000)]
Merge "Add <endian.h> back and stop building one tool for the Mac."
Elliott Hughes [Mon, 10 Aug 2015 22:49:04 +0000 (15:49 -0700)]
Add <endian.h> back and stop building one tool for the Mac.
We can't stop building all this stuff until we clean up the build
system to not require the OTA tools on Mac OS. This code does actually
use htobe64 and so should have included <endian.h>, so put that back.
Change-Id: I2807b4f237d3e26d470652f373f2de85864691c4
Elliott Hughes [Mon, 10 Aug 2015 22:22:03 +0000 (22:22 +0000)]
am
4361173d: Merge "Another go at fixing the Mac build."
* commit '
4361173d8b9d348e9566f754044db3fedfdf47eb':
Another go at fixing the Mac build.
Elliott Hughes [Mon, 10 Aug 2015 21:52:31 +0000 (21:52 +0000)]
Merge "Another go at fixing the Mac build."
Elliott Hughes [Mon, 10 Aug 2015 21:51:20 +0000 (14:51 -0700)]
Another go at fixing the Mac build.
I don't want to have to work out how to disable building OTAs on Macs --
though we should -- but it actually looks like this file didn't need the
problematic header file anyway.
Change-Id: I9d7eff8e72192958b3e880ae48fef194820ce148
Elliott Hughes [Mon, 10 Aug 2015 20:04:27 +0000 (13:04 -0700)]
resolved conflicts for merge of
b699685e to mnc-dev-plus-aosp
Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a
Elliott Hughes [Mon, 10 Aug 2015 17:54:35 +0000 (17:54 +0000)]
Merge "Fix Mac build."
Elliott Hughes [Mon, 10 Aug 2015 17:43:57 +0000 (10:43 -0700)]
Fix Mac build.
Change-Id: I4d389d7050970d8fd460a4238e8c2963211780b4
Yabin Cui [Fri, 7 Aug 2015 23:29:04 +0000 (23:29 +0000)]
am
c19b2933: Merge "Simpleperf: add filters to report command."
* commit '
c19b2933408bad3ae45de3817719943d1465af69':
Simpleperf: add filters to report command.
Yabin Cui [Fri, 7 Aug 2015 23:15:42 +0000 (23:15 +0000)]
Merge "Simpleperf: add filters to report command."
Yabin Cui [Thu, 6 Aug 2015 18:25:09 +0000 (11:25 -0700)]
Simpleperf: add filters to report command.
Change-Id: I0e6cec1ce638fd4c832fe398a08168138e22ee7e
Yabin Cui [Fri, 7 Aug 2015 21:16:57 +0000 (21:16 +0000)]
am
a5732f78: Merge "Simpleperf: support caller callgraph."
* commit '
a5732f780a1485ac1d8f9855bc2a0b56714afe42':
Simpleperf: support caller callgraph.
Yabin Cui [Fri, 7 Aug 2015 16:12:18 +0000 (16:12 +0000)]
Merge "Simpleperf: support caller callgraph."
Yabin Cui [Thu, 6 Aug 2015 17:36:13 +0000 (17:36 +0000)]
am
32ee7cc0: Merge "Simpleperf: don\'t check for empty build id."
* commit '
32ee7cc00b4136765764266446600aaf2184b246':
Simpleperf: don't check for empty build id.
Yabin Cui [Thu, 6 Aug 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Simpleperf: don't check for empty build id."
Yabin Cui [Tue, 4 Aug 2015 21:48:39 +0000 (14:48 -0700)]
Simpleperf: don't check for empty build id.
Change-Id: I670ba4fa32aa764e49022abacd83ef1fdcfa7d0d
Yabin Cui [Wed, 5 Aug 2015 00:33:47 +0000 (17:33 -0700)]
Simpleperf: support caller callgraph.
Bug:
22229391
Change-Id: I95af71d50811feb4515a5c4ec7102788a00aad31