OSDN Git Service
Yusuke Sato [Thu, 27 Aug 2015 11:17:29 +0000 (11:17 +0000)]
am
b44cb476: (-s ours) am
25d34e2a: Merge "Use the new version of android_fork_execvp_ext()"
* commit '
b44cb4765e8c7f56ec14a678cf41ddf76907cb8f':
Yabin Cui [Thu, 27 Aug 2015 11:17:29 +0000 (11:17 +0000)]
am
f0749467: (-s ours) am
3c599ffc: Merge "Simpleperf: demangle symbols only when necessary."
* commit '
f074946783516e0ae4d516ae11ad65217e884086':
Riley Andrews [Thu, 27 Aug 2015 11:17:28 +0000 (11:17 +0000)]
am
33a1c1d4: (-s ours) am
2c0f9f26: Merge "Add memcpy perf test + graphing script."
* commit '
33a1c1d4553bd039c1aa79eb064ebc3d6f09ce01':
Andreas Gampe [Thu, 27 Aug 2015 11:17:26 +0000 (11:17 +0000)]
am
a4a67260: (-s ours) Ext4utils: Fix unused parameters
* commit '
a4a6726008ebd46007f98138d907bbe499861b3e':
Ext4utils: Fix unused parameters
Dan Albert [Thu, 27 Aug 2015 11:17:25 +0000 (11:17 +0000)]
am
2aaa82e4: (-s ours) am
89a2254a: Merge "Add missing include."
* commit '
2aaa82e49e6772074533f0b1ee41925b54db7fe7':
Dan Albert [Thu, 27 Aug 2015 11:17:24 +0000 (11:17 +0000)]
am
b3b872cb: (-s ours) am
587fc682: Merge "Add missing includes for pid_t."
* commit '
b3b872cb208ca78e2f6c5e8049a68b02cc28298f':
Elliott Hughes [Thu, 27 Aug 2015 11:17:23 +0000 (11:17 +0000)]
am
ea239735: (-s ours) am
31d0d7cb: Merge "Add <endian.h> back and stop building one tool for the Mac."
* commit '
ea239735a66f87407e95f42fa9d78315596ca28d':
Elliott Hughes [Thu, 27 Aug 2015 11:17:22 +0000 (11:17 +0000)]
am
3881aa9e: (-s ours) am
4361173d: Merge "Another go at fixing the Mac build."
* commit '
3881aa9e018e3b1796dfb890643ccb565056c850':
Elliott Hughes [Thu, 27 Aug 2015 11:17:22 +0000 (11:17 +0000)]
am
a8b5f7e7: (-s ours) resolved conflicts for merge of
b699685e to mnc-dev-plus-aosp
* commit '
a8b5f7e73703c3d57086f7aded1749a0801dd997':
Yabin Cui [Thu, 27 Aug 2015 11:17:21 +0000 (11:17 +0000)]
am
1d4a76c5: (-s ours) am
c19b2933: Merge "Simpleperf: add filters to report command."
* commit '
1d4a76c50f3f7d7cbc576e993239eb33f8456ff0':
Yabin Cui [Thu, 27 Aug 2015 11:17:20 +0000 (11:17 +0000)]
am
decd599f: (-s ours) am
a5732f78: Merge "Simpleperf: support caller callgraph."
* commit '
decd599fd8238d3b9f50dfd25b3b873cb98539a5':
Yabin Cui [Thu, 27 Aug 2015 11:17:19 +0000 (11:17 +0000)]
am
cc22abb7: (-s ours) am
32ee7cc0: Merge "Simpleperf: don\'t check for empty build id."
* commit '
cc22abb73c63913f506306f246e9dc3b25fe879f':
Yabin Cui [Thu, 27 Aug 2015 11:17:18 +0000 (11:17 +0000)]
am
32413f33: (-s ours) am
ec53f3cc: Merge "Simpleperf: fix the process of parsing records."
* commit '
32413f33abb4e0b59ae7cdc5fab51557c82ebc34':
Yabin Cui [Thu, 27 Aug 2015 11:17:17 +0000 (11:17 +0000)]
am
0c238ed4: (-s ours) am
224d3ba8: Merge "Simpleperf: correct the event type name printed in stat command."
* commit '
0c238ed4ec7a8f81665dbb6b5c4a6b0f97a569a7':
Elliott Hughes [Thu, 27 Aug 2015 11:17:16 +0000 (11:17 +0000)]
am
71d722ac: (-s ours) am
9c6eab9a: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit '
71d722acbbd99160016840bc60182f253aac648b':
Erik Kline [Thu, 27 Aug 2015 11:17:15 +0000 (11:17 +0000)]
am
8883d0e3: (-s ours) am
504462b2: Merge "Tests for candidate source address restriction"
* commit '
8883d0e35adea68bb020ee345db45e11ba11e3c1':
Simon Wilson [Thu, 27 Aug 2015 11:17:14 +0000 (11:17 +0000)]
am
ad06e79d: (-s ours) resolved conflicts for merge of
743e4b08 to mnc-dev-plus-aosp
* commit '
ad06e79de060959cf5bea8a3d09e86cb097f67ed':
Lorenzo Colitti [Thu, 27 Aug 2015 11:17:13 +0000 (11:17 +0000)]
am
1203ee33: (-s ours) am
07d188ad: Merge "Fix lint errors."
* commit '
1203ee33a1743648126f71aa340608458e774204':
Yabin Cui [Thu, 27 Aug 2015 11:17:12 +0000 (11:17 +0000)]
am
f0737a5a: (-s ours) am
ae5cab41: Merge "Simpleperf: work around unexpected (pid, tid) pair."
* commit '
f0737a5a622bdfbaea6abfa8883c9e691f707afc':
Yabin Cui [Thu, 27 Aug 2015 11:17:11 +0000 (11:17 +0000)]
am
eb2e4a48: (-s ours) am
5c9978ce: Merge "Simpleperf: use ThreadTree when getting hit files in record command."
* commit '
eb2e4a48c5e2d1738865896cb8b75134d50f7a7d':
Yabin Cui [Thu, 27 Aug 2015 11:17:10 +0000 (11:17 +0000)]
am
3033e307: (-s ours) am
47efd844: Merge "Simpleperf: separate ThreadTree from SampleTree."
* commit '
3033e3078230c70f7eced2641a20a081f4763f1e':
Yabin Cui [Thu, 27 Aug 2015 11:17:09 +0000 (11:17 +0000)]
am
29f06c72: (-s ours) am
defcf4e2: Merge "Simpleperf: load symbols from dso file only when necessary."
* commit '
29f06c7282f3de917d76d8f4f86de4cc089b1683':
Yabin Cui [Thu, 27 Aug 2015 11:17:08 +0000 (11:17 +0000)]
am
01302684: (-s ours) am
dece0f92: Merge "Simpleperf: dump thread comm/mmaps for selected threads."
* commit '
01302684e408bf56f7344b61e198b94af079916f':
Yabin Cui [Thu, 27 Aug 2015 11:17:06 +0000 (11:17 +0000)]
am
e3f8854d: (-s ours) am
a209544b: Merge "Simpleperf: fix build on mac."
* commit '
e3f8854d3dd66f2508beabe07f7455b3739d3c2a':
Yabin Cui [Thu, 27 Aug 2015 11:17:05 +0000 (11:17 +0000)]
am
f7107bb6: (-s ours) am
98f391f3: Merge "Simpleperf: support --vmlinux option in report command."
* commit '
f7107bb694eb5137b5bafa96405e71febeb802d2':
Yabin Cui [Thu, 27 Aug 2015 11:17:04 +0000 (11:17 +0000)]
am
bacf4039: (-s ours) am
3fd76bc7: Merge "Simpleperf: fix build error on mips."
* commit '
bacf4039d7e7e260cf2576a1f25f714344676f09':
Yabin Cui [Thu, 27 Aug 2015 11:17:02 +0000 (11:17 +0000)]
am
9ff72d35: (-s ours) am
f1732eed: Merge "Simpleperf: Support dwarf callgraph recording."
* commit '
9ff72d357e41bb3f96bcf66a9d63b2162dd774fc':
Tao Bao [Thu, 27 Aug 2015 11:17:01 +0000 (11:17 +0000)]
am
e2d1e633: (-s ours) am
dfff022d: Merge "ext4_utils: Wrap wipe.h to be C++ compatible."
* commit '
e2d1e6331bd16d8cd867c0690da067e025c90884':
Yabin Cui [Thu, 27 Aug 2015 11:17:00 +0000 (11:17 +0000)]
am
56d72007: (-s ours) am
577974bd: Merge "Simpleperf: remove unnecessary std::move."
* commit '
56d72007a285fcc3ce790fe8ee4202420aaf47f8':
Yabin Cui [Thu, 27 Aug 2015 11:16:58 +0000 (11:16 +0000)]
am
8acc1fc0: (-s ours) am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
8acc1fc01c91734a51ecdac25dcbc7733ea1b7f9':
Andreas Gampe [Thu, 27 Aug 2015 11:16:57 +0000 (11:16 +0000)]
am
0653bb7d: (-s ours) am
60bbb93d: Merge "Simpleperf: Fix unused parameter"
* commit '
0653bb7d881efb6faa64f2dcc7d099d5287e22a2':
Yabin Cui [Thu, 27 Aug 2015 11:16:56 +0000 (11:16 +0000)]
am
c35c060a: (-s ours) am
13dedc6a: Merge "Simpleperf: check build id in report command."
* commit '
c35c060adfaa7b80d7eed30c2fd2d76c34ba1e35':
Thierry Strudel [Thu, 27 Aug 2015 11:16:54 +0000 (11:16 +0000)]
am
6999c941: (-s ours) am
b89e81dc: fs_config: align with new explicit fs_config target_out parameter
* commit '
6999c941d7e6ec256e3047a5136e00502206fefd':
Gopinath [Wed, 26 Aug 2015 18:02:06 +0000 (18:02 +0000)]
am
ab7f3975: am
58cd4204: am
c7d19e4d: Adding 64 bit emmc_rand_perf
* commit '
ab7f3975f5fb89e8cf823a623fe9973de7cb7bed':
Adding 64 bit emmc_rand_perf
Gopinath [Wed, 26 Aug 2015 17:48:32 +0000 (17:48 +0000)]
am
58cd4204: am
c7d19e4d: Adding 64 bit emmc_rand_perf
* commit '
58cd4204135501f59059763e699ea3df6430c828':
Adding 64 bit emmc_rand_perf
Gopinath [Wed, 26 Aug 2015 17:40:34 +0000 (17:40 +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:24:01 +0000 (17:24 +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:04:53 +0000 (00:04 +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:25:29 +0000 (22:25 +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:24:36 +0000 (18:24 +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:20 +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 02:17:59 +0000 (02:17 +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
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:25:49 +0000 (22:25 +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:20:30 +0000 (22:20 +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:22 +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: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:11 +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: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
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:40 +0000 (02:05 +0000)]
am
89a2254a: Merge "Add missing include."
* commit '
89a2254abae3f427aa85fb3a3afe9a27cdfad68d':
Add missing include.
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:27 +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: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:54 +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 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:47 +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 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 20:01:59 +0000 (13:01 -0700)]
resolved conflicts for merge of
b699685e to mnc-dr-dev-plus-aosp
Change-Id: I4d517d1e17fc512730e9d9d61562cb6407a8729a
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:28:54 +0000 (23:28 +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 21:12:58 +0000 (21:12 +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.