OSDN Git Service
Yabin Cui [Thu, 10 Mar 2016 22:16:37 +0000 (22:16 +0000)]
Merge "simpleperf: check if dwarf callgraph is supported by kernel before testing." into nyc-dev
am:
ad64c38f56
* commit '
ad64c38f5652c8557c3f61953a92c457da3e82d4':
simpleperf: check if dwarf callgraph is supported by kernel before testing.
Paul Crowley [Thu, 10 Mar 2016 22:16:37 +0000 (22:16 +0000)]
Merge "Avoid bogus warnings by branching on whether dir is empty." into nyc-dev
am:
2435622d30
* commit '
2435622d30695d8f51cb203f2637643ea14170e5':
Avoid bogus warnings by branching on whether dir is empty.
Srinath Sridharan [Thu, 10 Mar 2016 22:16:36 +0000 (22:16 +0000)]
Crypto performance benchmark
am:
9627638747
* commit '
9627638747d7418dc3be9617a99a33c688e3bf87':
Crypto performance benchmark
Yabin Cui [Thu, 10 Mar 2016 22:04:06 +0000 (22:04 +0000)]
Merge "simpleperf: check if dwarf callgraph is supported by kernel before testing." into nyc-dev
Paul Crowley [Thu, 10 Mar 2016 22:02:45 +0000 (22:02 +0000)]
Merge "Avoid bogus warnings by branching on whether dir is empty." into nyc-dev
Yabin Cui [Thu, 10 Mar 2016 19:49:57 +0000 (11:49 -0800)]
simpleperf: check if dwarf callgraph is supported by kernel before testing.
Move inclusion of poll.h from header files to source files,
as event_selection_set.h is used by cmd_report_test.cpp, which
can be built on windows.
Bug:
27590546
Change-Id: Ic6b141a93d96610f911ab52da1d927b7f619ccb2
(cherry picked from commit
19e6b6d372a1244189dc2df62313085a61ed1a80)
Srinath Sridharan [Thu, 10 Mar 2016 18:22:30 +0000 (10:22 -0800)]
Crypto performance benchmark
This reverts commit
39087e3740095e1851b0fcf1988c1c0881a208b6. And adds
the respective fix.
Change-Id: I1f70211c77f892c6252cf5e05e5e52d6c63e2293
Paul Crowley [Thu, 10 Mar 2016 20:44:14 +0000 (12:44 -0800)]
Avoid bogus warnings by branching on whether dir is empty.
If the directory is empty, we try to set policy, otherwise we get it.
Bug:
27596572
Change-Id: I127534b7e43c95cf259f001b0acba255a117f76e
Srinath Sridharan [Thu, 10 Mar 2016 01:42:52 +0000 (01:42 +0000)]
Merge "Revert "Crypto performance benchmark"" into nyc-dev
am:
de1e5fc187
* commit '
de1e5fc187f1fa6037f65a3d59805b23b8836660':
Revert "Crypto performance benchmark"
Srinath Sridharan [Thu, 10 Mar 2016 01:39:04 +0000 (01:39 +0000)]
Merge "Revert "Crypto performance benchmark"" into nyc-dev
Srinath Sridharan [Thu, 10 Mar 2016 01:33:15 +0000 (01:33 +0000)]
Revert "Crypto performance benchmark"
This reverts commit
00652d85b0228bf70905a4934e88a38471832ac2.
Change-Id: I550ebd2e25c275a03e4f93437e6f12f83e232c7f
Srinath Sridharan [Thu, 10 Mar 2016 00:49:14 +0000 (00:49 +0000)]
Merge "Crypto performance benchmark" into nyc-dev
am:
89e7f9748c
* commit '
89e7f9748cf3fcb5360357dd44ed4ec6639f6d4c':
Crypto performance benchmark
Srinath Sridharan [Thu, 10 Mar 2016 00:38:05 +0000 (00:38 +0000)]
Merge "Crypto performance benchmark" into nyc-dev
Srinath Sridharan [Tue, 8 Mar 2016 22:54:28 +0000 (14:54 -0800)]
Crypto performance benchmark
Before running the benchmark do the following:
Lock the frequency of the core by setting scaling_min_freq=scaling_max_freq=DESIRED_FREQ
Change-Id: Ic291ae4db6a202ea2e968dc6823c61d352eb272d
Mohamad Ayyash [Wed, 9 Mar 2016 21:07:52 +0000 (21:07 +0000)]
Merge changes from topic \'incremental-ext4\' into nyc-dev
am:
e958ab33e6
* commit '
e958ab33e69493770e458a45677d7962ca58dd61':
make_ext4_fs: Clean up a few error messages
Introduce blk_alloc_to_base_fs utility
Mohamad Ayyash [Wed, 9 Mar 2016 20:56:18 +0000 (20:56 +0000)]
Merge changes from topic 'incremental-ext4' into nyc-dev
* changes:
make_ext4_fs: Clean up a few error messages
Introduce blk_alloc_to_base_fs utility
Mark Salyzyn [Wed, 9 Mar 2016 19:31:53 +0000 (19:31 +0000)]
Merge "su: Segmentation Fault on unknown numerical uids"
am:
5ecd3d5fa4
* commit '
5ecd3d5fa48c5c4467a040bebcbd0aaa5f83a337':
su: Segmentation Fault on unknown numerical uids
Mark Salyzyn [Wed, 9 Mar 2016 18:32:42 +0000 (18:32 +0000)]
cts: android.kernel.config
am:
0a34d46204
* commit '
0a34d462046a77c7649a40226b06c2232a547635':
cts: android.kernel.config
Mark Salyzyn [Wed, 9 Mar 2016 18:32:42 +0000 (18:32 +0000)]
su: Segmentation Fault on unknown numerical uids
am:
75dbde9b57
* commit '
75dbde9b57c0bb76927ad16b4f1b65aa0e9eb5f4':
su: Segmentation Fault on unknown numerical uids
Mark Salyzyn [Thu, 11 Feb 2016 22:20:24 +0000 (14:20 -0800)]
cts: android.kernel.config
(cherry pick from commit
67522d05df61e7757e1ff08ba0b7ad0f19406ec0)
- Added plumbing for CTS tests
- Divide Required into CTS and gTest and
Recommended into gTest
- Added check of CONFIG_ANDROID_LOGGER
- test typically completes after 3ms
Bug:
19173869
Change-Id: I13a92081bfa9b53abb69923b160b82e3be2142ab
Mark Salyzyn [Tue, 8 Mar 2016 21:36:00 +0000 (13:36 -0800)]
su: Segmentation Fault on unknown numerical uids
(cherry pick from commit
45948f910c69d354cc3f7e81631445d83ebadc3d)
e.g.
su 2999,2999,2999 echo hello
Segmentation Fault
return from getpwuid is NULL. KISS we opt to unset LOGNAME and USER
Change-Id: I7e7eddacfd6857f83482727eb5ec5c51b9170039
Mark Salyzyn [Wed, 9 Mar 2016 16:50:49 +0000 (16:50 +0000)]
Merge "su: Segmentation Fault on unknown numerical uids"
Mark Salyzyn [Tue, 8 Mar 2016 21:36:00 +0000 (13:36 -0800)]
su: Segmentation Fault on unknown numerical uids
e.g.
su 2999,2999,2999 echo hello
Segmentation Fault
return from getpwuid is NULL. KISS we opt to unset LOGNAME and USER
Change-Id: I7e7eddacfd6857f83482727eb5ec5c51b9170039
Thierry Strudel [Wed, 9 Mar 2016 00:45:52 +0000 (00:45 +0000)]
cpustats: do not die in case a CPU is offlined
am:
e363c2db05
* commit '
e363c2db056fefd6b45d77a36a39de8fa85dad7b':
cpustats: do not die in case a CPU is offlined
Thierry Strudel [Tue, 13 Oct 2015 22:10:32 +0000 (15:10 -0700)]
cpustats: do not die in case a CPU is offlined
Change-Id: I05700266f1c7584ff51557b3e559654045379e87
Mark Salyzyn [Tue, 8 Mar 2016 23:57:23 +0000 (23:57 +0000)]
Merge "cts: android.kernel.config"
am:
07efeb6e2d
* commit '
07efeb6e2de34fc52da417a56449d44fd9cb9ca7':
cts: android.kernel.config
Mark Salyzyn [Tue, 8 Mar 2016 23:48:05 +0000 (23:48 +0000)]
Merge "cts: android.kernel.config"
Tim Murray [Tue, 8 Mar 2016 22:40:58 +0000 (22:40 +0000)]
Merge "Add support for filtering based on app name to pagecache." into nyc-dev
am:
affcb23f28
* commit '
affcb23f280cae4d6c73388e98ec52e46a25dec3':
Add support for filtering based on app name to pagecache.
Tim Murray [Tue, 8 Mar 2016 22:19:36 +0000 (22:19 +0000)]
Merge "Add support for filtering based on app name to pagecache." into nyc-dev
Yabin Cui [Tue, 8 Mar 2016 00:19:04 +0000 (00:19 +0000)]
simpleperf: support building cts test.
am:
b7724264f7
* commit '
b7724264f7b0119277ef6d205d55687e393bbaf9':
simpleperf: support building cts test.
Yabin Cui [Wed, 2 Mar 2016 21:56:28 +0000 (13:56 -0800)]
simpleperf: support building cts test.
1. build cts test libraries.
2. change tests to use tmpfile instead of perf.data.
3. support extracting testdata from cts test file.
Bug:
27387280
Change-Id: I7c5db77f3157d586d0c9beb446b247626e7cce36
(cherry picked from commit
be7ec66eaa4f995bd9068637f7c7d5718173922c)
Yabin Cui [Mon, 7 Mar 2016 21:33:01 +0000 (21:33 +0000)]
simpleperf: fix mac build.
am:
08663eb56b
* commit '
08663eb56b17e5ce1a9b0030d5a965306de0e3ae':
simpleperf: fix mac build.
Yabin Cui [Mon, 7 Mar 2016 21:32:51 +0000 (21:32 +0000)]
simpleperf: port cmd_report_test to nonlinux.
am:
025745a017 -s ours
* commit '
025745a017b893797c1532da704edd0a2854cb14':
simpleperf: port cmd_report_test to nonlinux.
Yabin Cui [Mon, 7 Mar 2016 21:21:17 +0000 (21:21 +0000)]
simpleperf: fix build by removing off64_t.
am:
cc9bc34039
* commit '
cc9bc34039544d2dcca7168958a80828bac8d089':
simpleperf: fix build by removing off64_t.
Yabin Cui [Mon, 7 Mar 2016 21:21:09 +0000 (21:21 +0000)]
simpleperf: report symbols of native libraries in apk file.
am:
7288501a66 -s ours
* commit '
7288501a660ce2616539e8a963185d2f3c679729':
simpleperf: report symbols of native libraries in apk file.
Yabin Cui [Mon, 7 Mar 2016 21:17:25 +0000 (21:17 +0000)]
simpleperf: accept different perf_attr sizes.
am:
9a1f829db0
* commit '
9a1f829db03dc9ad9701b4ddae1267d3140e84f4':
simpleperf: accept different perf_attr sizes.
Yabin Cui [Mon, 7 Mar 2016 21:17:15 +0000 (21:17 +0000)]
simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
am:
0bd2a5cef3 -s ours
* commit '
0bd2a5cef3cf787552c55f643631b6ba77637711':
simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
Yabin Cui [Thu, 25 Feb 2016 19:02:30 +0000 (11:02 -0800)]
simpleperf: fix mac build.
I forgot that mac doesn't support whole static library. Change to static library
to avoid hiting the same problem in the future.
Bug:
26962895
Change-Id: Ia8e26c2e1cf7621391e00e100b22b7ed451dfa32
(cherry picked from commit
ff7465c896ab90c162cbcf2b141c4cdd79bf437f)
Yabin Cui [Wed, 24 Feb 2016 05:41:03 +0000 (21:41 -0800)]
simpleperf: port cmd_report_test to nonlinux.
And fix one build_id bug introduced by previous patch.
Bug:
26962895
Change-Id: Ibb8bd6ec77ee862bb01c26342d3b3024468e75b2
(cherry picked from commit
6e51bef9aa101307523946df301ca90215d0ee82)
Yabin Cui [Thu, 18 Feb 2016 20:11:40 +0000 (12:11 -0800)]
simpleperf: fix build by removing off64_t.
Bug:
26962895
Change-Id: I211bacc22c2f6b6b24c639365c706e93d66ce4ac
(cherry picked from commit
41e32ca272f474d35a84a6e7c7f0a28c3160abc3)
Yabin Cui [Mon, 15 Feb 2016 03:18:02 +0000 (19:18 -0800)]
simpleperf: report symbols of native libraries in apk file.
Changes included:
1. provide interface in read_apk.h to read build id and symbols.
2. report symbols of native libraries in apk file.
3. refactor code in read_elf.cpp and read_apk.cpp.
4. add verbose log.
5. add -o report_file_name option for report command.
6. add corresponding unit tests.
Bug:
26962895
Change-Id: I0d5398996e0c29dba4a6f5226692b758ca096bbd
(cherry picked from commit
b1a885b014540a2f7798b5a35ea0f0ec150d93ee)
Yabin Cui [Tue, 16 Feb 2016 20:15:31 +0000 (12:15 -0800)]
simpleperf: accept different perf_attr sizes.
The size of perf_attr can be increased as new features are added. And
we can accept different perf_attr sizes in perf.data, and ignore
unknown features.
Bug:
26962895
Change-Id: Ia42617f92acb3ab6ae56eb91aa0d7b73efc0b8af
(cherry picked from commit
dd2ae2878b7e5ac1754da55a08cbcdacadf53d78)
Yabin Cui [Sat, 6 Feb 2016 01:32:08 +0000 (17:32 -0800)]
simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
Also make following small changes:
1. Manage testdata files like libziparchive.
2. Replace StringToPid() with android::base::ParseInt().
3. Add tests in read_elf_test.
Bug:
26962895
Change-Id: I6603e9f3cea3a013e2618ea003790d102739f843
(cherry picked from commit
569f64afd3db2b43003978765b833669f99477d2)
Chih-Hung Hsieh [Fri, 4 Mar 2016 19:58:38 +0000 (19:58 +0000)]
Merge "Fix static analyzer warnings." am:
5667da92fd
am:
be20231f03
* commit '
be20231f033abe912cde88c3d6e8ef41d33cdff6':
Fix static analyzer warnings.
Chih-Hung Hsieh [Fri, 4 Mar 2016 19:56:37 +0000 (19:56 +0000)]
Merge "Fix static analyzer warnings."
am:
5667da92fd
* commit '
5667da92fd874c30eff40eae488ae6e05dba9d31':
Fix static analyzer warnings.
Chih-hung Hsieh [Fri, 4 Mar 2016 19:38:44 +0000 (19:38 +0000)]
Merge "Fix static analyzer warnings."
Chih-Hung Hsieh [Fri, 4 Mar 2016 18:14:32 +0000 (10:14 -0800)]
Fix static analyzer warnings.
* Add missing free.
* Remove unused local variable.
BUG:
27120398
Change-Id: I84d32fcee5615a428bd1de6673a6f15036736998
Alex Deymo [Fri, 4 Mar 2016 05:47:24 +0000 (05:47 +0000)]
Merge "postinst: Update postinstall_example documentation." am:
9be329ae32
am:
11711d63fa
* commit '
11711d63fa195ada77ec9f95b498136d5b64f464':
postinst: Update postinstall_example documentation.
Alex Deymo [Fri, 4 Mar 2016 05:45:33 +0000 (05:45 +0000)]
Merge "postinst: Update postinstall_example documentation."
am:
9be329ae32
* commit '
9be329ae3292cd3c90057bb8b945ac55ff35b2ca':
postinst: Update postinstall_example documentation.
Alex Deymo [Fri, 4 Mar 2016 05:39:49 +0000 (05:39 +0000)]
Merge "postinst: Update postinstall_example documentation."
George Burgess IV [Thu, 3 Mar 2016 22:03:17 +0000 (22:03 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it." am:
33f2127b43
am:
4604c8e464
* commit '
4604c8e4648cc0298f96a40ab5e51a6a22e792d4':
Cleanup uses of sprintf so we can deprecate it.
George Burgess IV [Thu, 3 Mar 2016 21:53:17 +0000 (21:53 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
am:
33f2127b43
* commit '
33f2127b43c3f0a5bd4496822222810f22e1489d':
Cleanup uses of sprintf so we can deprecate it.
George Burgess IV [Thu, 3 Mar 2016 21:44:56 +0000 (21:44 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it."
Yabin Cui [Thu, 3 Mar 2016 19:42:46 +0000 (19:42 +0000)]
Merge "simpleperf: support building cts test." am:
acf5a605e8
am:
50c29925a3
* commit '
50c29925a3a59aa6cfbaa9868dcb091d75ef87a1':
simpleperf: support building cts test.
Yabin Cui [Thu, 3 Mar 2016 19:08:53 +0000 (19:08 +0000)]
Merge "simpleperf: support building cts test."
am:
acf5a605e8
* commit '
acf5a605e8e97f6beab23a2b270a02c3565c12cd':
simpleperf: support building cts test.
Yabin Cui [Thu, 3 Mar 2016 18:59:38 +0000 (18:59 +0000)]
Merge "simpleperf: support building cts test."
Mohamad Ayyash [Thu, 3 Mar 2016 05:10:45 +0000 (21:10 -0800)]
make_ext4_fs: Clean up a few error messages
Change-Id: I269859a2c6beefb154fd483a02b29649416d60f9
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Yabin Cui [Wed, 2 Mar 2016 21:56:28 +0000 (13:56 -0800)]
simpleperf: support building cts test.
1. build cts test libraries.
2. change tests to use tmpfile instead of perf.data.
3. support extracting testdata from cts test file.
Bug:
27387280
Change-Id: I7c5db77f3157d586d0c9beb446b247626e7cce36
Alex Deymo [Thu, 3 Mar 2016 02:02:17 +0000 (18:02 -0800)]
postinst: Update postinstall_example documentation.
We don't need the /postinst symlink anymore, instead we should provide
the path to the executable in the config. An example of how to setup
that is now included in the documentation of postinstall_example.
Bug:
27177071
TEST=Deployed this script as postinstall on edison-eng.
Change-Id: I2f7bd50174db42a57d25277883b0ec795ca17144
Mohamad Ayyash [Fri, 26 Feb 2016 21:58:44 +0000 (13:58 -0800)]
Introduce blk_alloc_to_base_fs utility
Converts regular block mapping files into the new base_fs file format
for generating incremental ext4 images
Internal Design Doc: go/incremental-ext4
BUG:
26839493
Change-Id: If8dbb49718226771495c044eb1a8403e99a971fb
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
George Burgess IV [Wed, 2 Mar 2016 22:15:49 +0000 (14:15 -0800)]
Cleanup uses of sprintf so we can deprecate it.
Change-Id: I3ed15a7c261adf01c310bb58ff7ce836ea400bba
Tim Murray [Wed, 2 Mar 2016 22:02:51 +0000 (14:02 -0800)]
Add support for filtering based on app name to pagecache.
Change-Id: I571d254d69a255dd1b9fd7f33d98e7daa4b5ad5f
Yabin Cui [Wed, 2 Mar 2016 19:10:14 +0000 (19:10 +0000)]
Merge "simpleperf: fix analyzer warning." am:
5cfed7b49b
am:
fab91a6086
* commit '
fab91a60861bbb8ba69971e4a899143fe5ef46af':
simpleperf: fix analyzer warning.
Yabin Cui [Wed, 2 Mar 2016 18:59:04 +0000 (18:59 +0000)]
Merge "simpleperf: fix analyzer warning."
am:
5cfed7b49b
* commit '
5cfed7b49b1ae706265d4181b1d4f0dbb79491f5':
simpleperf: fix analyzer warning.
Yabin Cui [Wed, 2 Mar 2016 18:47:52 +0000 (18:47 +0000)]
Merge "simpleperf: fix analyzer warning."
Lorenzo Colitti [Wed, 2 Mar 2016 08:24:45 +0000 (08:24 +0000)]
Merge "Delete net_test from system/extras now that it\'s in kernel/tests." am:
3669b3f331
am:
fb9148766a
* commit '
fb9148766a14d932c993dfc4cdb6a1dd46a82e83':
Delete net_test from system/extras now that it's in kernel/tests.
Lorenzo Colitti [Wed, 2 Mar 2016 08:15:41 +0000 (08:15 +0000)]
Merge "Delete net_test from system/extras now that it\'s in kernel/tests."
am:
3669b3f331
* commit '
3669b3f331485fec4a304177b8a80a25efd1f7d8':
Delete net_test from system/extras now that it's in kernel/tests.
Lorenzo Colitti [Wed, 2 Mar 2016 08:04:01 +0000 (08:04 +0000)]
Merge "Delete net_test from system/extras now that it's in kernel/tests."
Yabin Cui [Tue, 1 Mar 2016 22:05:25 +0000 (14:05 -0800)]
simpleperf: fix analyzer warning.
Bug:
27432175
Change-Id: If0e8bc724cf659508726215d515d3df30cbebe6b
Elliott Hughes [Wed, 2 Mar 2016 02:25:03 +0000 (02:25 +0000)]
Fix pagemap_test#maps.
am:
f018ba35fa
* commit '
f018ba35fad06c3cf389a89e97d16d1b98251d63':
Fix pagemap_test#maps.
Chih-Hung Hsieh [Tue, 1 Mar 2016 22:34:37 +0000 (22:34 +0000)]
Merge "Fix one static analyzer warning." am:
63728630cb
am:
e7afd3a049
* commit '
e7afd3a049a0fedcd1ced6cc85939480196e38da':
Fix one static analyzer warning.
Chih-Hung Hsieh [Tue, 1 Mar 2016 22:29:22 +0000 (22:29 +0000)]
Merge "Fix one static analyzer warning."
am:
63728630cb
* commit '
63728630cb507e1b797eafb6b22cc0720684b87c':
Fix one static analyzer warning.
Chih-hung Hsieh [Tue, 1 Mar 2016 22:22:28 +0000 (22:22 +0000)]
Merge "Fix one static analyzer warning."
Chih-Hung Hsieh [Tue, 1 Mar 2016 21:42:49 +0000 (13:42 -0800)]
Fix one static analyzer warning.
Result of 'realloc' is converted to a pointer of type 'struct
mapping_info *', which is incompatible with sizeof operand type 'struct
mapping *'
BUG:
27121003
Change-Id: Ib05b884ba577751a382b7a5dbbfea8cca2e0f23f
Elliott Hughes [Tue, 1 Mar 2016 16:02:37 +0000 (08:02 -0800)]
Fix pagemap_test#maps.
We don't necessarily have a brk-based heap.
Bug: http://b/
27425642
(cherry picked from commit
b2084a55a9e499b8c26b751956078282e12b0609)
Change-Id: Ia5c96fb26a8011c62037f3a3c4cbf44e3b936507
Elliott Hughes [Tue, 1 Mar 2016 20:09:12 +0000 (20:09 +0000)]
Merge "Fix pagemap_test#maps." am:
5dc5241d77
am:
02235d5d8d
* commit '
02235d5d8d8f20559803ac30ed367cb968cfa207':
Fix pagemap_test#maps.
Elliott Hughes [Tue, 1 Mar 2016 20:07:42 +0000 (20:07 +0000)]
Merge "Fix pagemap_test#maps."
am:
5dc5241d77
* commit '
5dc5241d7785569a6a4b65df475ac9451cdfe531':
Fix pagemap_test#maps.
Elliott Hughes [Tue, 1 Mar 2016 20:06:55 +0000 (20:06 +0000)]
Merge "Fix pagemap_test#maps."
Than McIntosh [Tue, 1 Mar 2016 19:46:36 +0000 (19:46 +0000)]
Merge "Fix typo in \'help report\' output." am:
4e6f660ab0
am:
fe4b8f25e2
* commit '
fe4b8f25e275c255f12fe3767d1e2fa4e31a9d2f':
Fix typo in 'help report' output.
Elliott Hughes [Tue, 1 Mar 2016 16:02:37 +0000 (08:02 -0800)]
Fix pagemap_test#maps.
We don't necessarily have a brk-based heap.
Bug: http://b/
27425642
Change-Id: Iac30904ba35c645afe9b056de8df975ebce92a37
Than McIntosh [Tue, 1 Mar 2016 18:31:34 +0000 (18:31 +0000)]
Merge "Fix typo in \'help report\' output."
am:
4e6f660ab0
* commit '
4e6f660ab0d58bd375deec17f36532254183d29d':
Fix typo in 'help report' output.
Than McIntosh [Tue, 1 Mar 2016 18:27:45 +0000 (18:27 +0000)]
Merge "Fix typo in 'help report' output."
Than McIntosh [Tue, 1 Mar 2016 17:38:33 +0000 (12:38 -0500)]
Fix typo in 'help report' output.
Was "--pid", should be "--pids".
Change-Id: Icb49a3d7568bd8f339bf0e4e1065fe2367514588
Yabin Cui [Thu, 25 Feb 2016 20:40:10 +0000 (20:40 +0000)]
Merge "simpleperf: fix mac build." am:
9e0f649ea9
am:
99adeea02a
* commit '
99adeea02aee4f2887f8dfb325ce919d404aad2f':
simpleperf: fix mac build.
Yabin Cui [Thu, 25 Feb 2016 20:38:25 +0000 (20:38 +0000)]
Merge "simpleperf: fix mac build."
am:
9e0f649ea9
* commit '
9e0f649ea94cce48df7bfca238fecac1ed1dac98':
simpleperf: fix mac build.
Yabin Cui [Thu, 25 Feb 2016 20:36:03 +0000 (20:36 +0000)]
Merge "simpleperf: fix mac build."
Yabin Cui [Thu, 25 Feb 2016 19:25:33 +0000 (19:25 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux." am:
ec2bf27cb9
am:
bfbf46b8fe
* commit '
bfbf46b8fe5f55abfbb0c55d248a73259d51655f':
simpleperf: port cmd_report_test to nonlinux.
Yabin Cui [Thu, 25 Feb 2016 19:09:44 +0000 (19:09 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux."
am:
ec2bf27cb9
* commit '
ec2bf27cb962e55cfa25116ba5880ecb19910a07':
simpleperf: port cmd_report_test to nonlinux.
Yabin Cui [Thu, 25 Feb 2016 19:08:07 +0000 (19:08 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux."
Yabin Cui [Thu, 25 Feb 2016 19:02:30 +0000 (11:02 -0800)]
simpleperf: fix mac build.
I forgot that mac doesn't support whole static library. Change to static library
to avoid hiting the same problem in the future.
Bug:
26962895
Change-Id: Ia8e26c2e1cf7621391e00e100b22b7ed451dfa32
Yabin Cui [Wed, 24 Feb 2016 05:41:03 +0000 (21:41 -0800)]
simpleperf: port cmd_report_test to nonlinux.
And fix one build_id bug introduced by previous patch.
Bug:
26962895
Change-Id: Ibb8bd6ec77ee862bb01c26342d3b3024468e75b2
Lorenzo Colitti [Thu, 25 Feb 2016 13:37:48 +0000 (22:37 +0900)]
Delete net_test from system/extras now that it's in kernel/tests.
The directories are identical. This commit was generated by:
$ diff -u system/extras/tests/net_test kernel/tests/net/test/
$ cd system/extras/tests/net_test
$ git rm *
Bug:
27228782
Change-Id: I08ca870049c8e91bb0848314bf647f6e1ad2dd09
Lorenzo Colitti [Thu, 25 Feb 2016 13:21:42 +0000 (13:21 +0000)]
Merge "Cite more kernel commits." am:
e090897280
am:
013f143ed8
* commit '
013f143ed8352a8d7274df783ad07945c872fdd8':
Cite more kernel commits.
Lorenzo Colitti [Thu, 25 Feb 2016 13:18:08 +0000 (13:18 +0000)]
Merge "Cite more kernel commits."
am:
e090897280
* commit '
e0908972807e5366aba6af130a53803333f94145':
Cite more kernel commits.
Lorenzo Colitti [Thu, 25 Feb 2016 13:13:19 +0000 (13:13 +0000)]
Merge "Cite more kernel commits."
Mohamad Ayyash [Wed, 24 Feb 2016 04:22:22 +0000 (04:22 +0000)]
Don\'t define incremental ext4 for windows
am:
ef24424e32
* commit '
ef24424e32921f509f98aae429b6efd9b0e4eae6':
Don't define incremental ext4 for windows
Mohamad Ayyash [Wed, 24 Feb 2016 04:13:02 +0000 (20:13 -0800)]
Don't define incremental ext4 for windows
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Change-Id: I1eba14f7f4db2174de8feaa9d8e5e41524ac1d32
Mohamad Ayyash [Tue, 23 Feb 2016 23:13:40 +0000 (23:13 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images
am:
9579198cd7
* commit '
9579198cd7d5b88b3508f1b00ddd77bd8da60682':
Redesign make_ext4fs to incrementally generate ext4 images
Mohamad Ayyash [Sat, 20 Feb 2016 03:46:00 +0000 (03:46 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images
Allows passing a base fs mapping file through -d which preserves the
location of those mapping in existing files
Internal Design Doc: go/incremental-ext4
BUG:
26839493
Change-Id: I05e296693429d39466d257d1d0a3daf00510dc26
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Lorenzo Colitti [Tue, 23 Feb 2016 14:42:10 +0000 (23:42 +0900)]
Cite more kernel commits.
Change-Id: Ia335d5c8461e7dfb41211977df74422e00012be8