OSDN Git Service

android-x86/system-extras.git
8 years agocpustats: do not die in case a CPU is offlined am: e363c2db05
Thierry Strudel [Wed, 9 Mar 2016 00:56:01 +0000 (00:56 +0000)]
cpustats: do not die in case a CPU is offlined am: e363c2db05
am: 311f552d43

* commit '311f552d439b583cadf5fa6185bce8e5f18f240b':
  cpustats: do not die in case a CPU is offlined

8 years agocpustats: do not die in case a CPU is offlined
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

8 years agocpustats: 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

8 years agoMerge "cts: android.kernel.config" am: 07efeb6e2d
Mark Salyzyn [Wed, 9 Mar 2016 00:13:58 +0000 (00:13 +0000)]
Merge "cts: android.kernel.config" am: 07efeb6e2d
am: 005e856162

* commit '005e85616208b387c452825e8be079e20e174d38':
  cts: android.kernel.config

8 years agoMerge "cts: android.kernel.config"
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

8 years agoMerge "cts: android.kernel.config"
Mark Salyzyn [Tue, 8 Mar 2016 23:48:05 +0000 (23:48 +0000)]
Merge "cts: android.kernel.config"

8 years agoMerge "Add support for filtering based on app name to pagecache." into nyc-dev am...
Tim Murray [Tue, 8 Mar 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Add support for filtering based on app name to pagecache." into nyc-dev am: affcb23f28
am: 7b7272dac8

* commit '7b7272dac8ce3f549b66639f8aaf82f671d2f73b':
  Add support for filtering based on app name to pagecache.

8 years agoMerge "Add support for filtering based on app name to pagecache." into nyc-dev
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.

8 years agoMerge "Add support for filtering based on app name to pagecache." into nyc-dev
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

8 years agosimpleperf: support building cts test. am: b7724264f7
Yabin Cui [Tue, 8 Mar 2016 00:21:05 +0000 (00:21 +0000)]
simpleperf: support building cts test. am: b7724264f7
am: 601f898af0

* commit '601f898af003723641341c33a01e01435c2d132b':
  simpleperf: support building cts test.

8 years agosimpleperf: support building cts test.
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.

8 years agosimpleperf: 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)

8 years agosimpleperf: fix mac build. am: 08663eb56b
Yabin Cui [Mon, 7 Mar 2016 21:34:31 +0000 (21:34 +0000)]
simpleperf: fix mac build. am: 08663eb56b
am: 28ee6bd146

* commit '28ee6bd1461ed1bdd26f2c6a50bfed02525acbd0':
  simpleperf: fix mac build.

8 years agosimpleperf: port cmd_report_test to nonlinux. am: 025745a017 -s ours
Yabin Cui [Mon, 7 Mar 2016 21:34:25 +0000 (21:34 +0000)]
simpleperf: port cmd_report_test to nonlinux. am: 025745a017  -s ours
am: 937efaf2c5

* commit '937efaf2c5f83b6add1e5bf6f9c22bcbdaec24b7':
  simpleperf: port cmd_report_test to nonlinux.

8 years agosimpleperf: fix mac build.
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.

8 years agosimpleperf: port cmd_report_test to nonlinux.
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.

8 years agosimpleperf: fix build by removing off64_t. am: cc9bc34039
Yabin Cui [Mon, 7 Mar 2016 21:22:45 +0000 (21:22 +0000)]
simpleperf: fix build by removing off64_t. am: cc9bc34039
am: e53bec8419

* commit 'e53bec84191ecd4ba64a4c0d8d6ec52180eaf73e':
  simpleperf: fix build by removing off64_t.

8 years agosimpleperf: report symbols of native libraries in apk file. am: 7288501a66 -s ours
Yabin Cui [Mon, 7 Mar 2016 21:22:40 +0000 (21:22 +0000)]
simpleperf: report symbols of native libraries in apk file. am: 7288501a66  -s ours
am: 5b4b6a1095

* commit '5b4b6a1095c8b0998a2dc0a22ae10087b315563e':
  simpleperf: report symbols of native libraries in apk file.

8 years agosimpleperf: fix build by removing off64_t.
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.

8 years agosimpleperf: report symbols of native libraries in apk file.
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.

8 years agosimpleperf: accept different perf_attr sizes. am: 9a1f829db0
Yabin Cui [Mon, 7 Mar 2016 21:18:55 +0000 (21:18 +0000)]
simpleperf: accept different perf_attr sizes. am: 9a1f829db0
am: d00fd8714b

* commit 'd00fd8714b4193d6d10b82faf3e89152be25d5ef':
  simpleperf: accept different perf_attr sizes.

8 years agosimpleperf: port read_apk and read_apk/read_elf tests to nonlinux. am: 0bd2a5cef3...
Yabin Cui [Mon, 7 Mar 2016 21:18:49 +0000 (21:18 +0000)]
simpleperf: port read_apk and read_apk/read_elf tests to nonlinux. am: 0bd2a5cef3  -s ours
am: 531dd94a48

* commit '531dd94a483b53082cef50188ec10901f4014873':
  simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.

8 years agosimpleperf: accept different perf_attr sizes.
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.

8 years agosimpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
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.

8 years agosimpleperf: fix mac build.
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)

8 years agosimpleperf: port cmd_report_test to nonlinux.
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)

8 years agosimpleperf: fix build by removing off64_t.
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)

8 years agosimpleperf: report symbols of native libraries in apk file.
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)

8 years agosimpleperf: accept different perf_attr sizes.
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)

8 years agosimpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
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)

8 years agoMerge "Fix static analyzer warnings." am: 5667da92fd am: be20231f03
Chih-Hung Hsieh [Fri, 4 Mar 2016 20:02:47 +0000 (20:02 +0000)]
Merge "Fix static analyzer warnings." am: 5667da92fd am: be20231f03
am: 10d415d30e

* commit '10d415d30e75d6f51fa1073bb78311372f893a2a':
  Fix static analyzer warnings.

8 years agoMerge "Fix static analyzer warnings." am: 5667da92fd
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.

8 years agoMerge "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.

8 years agoMerge "Fix static analyzer warnings."
Chih-hung Hsieh [Fri, 4 Mar 2016 19:38:44 +0000 (19:38 +0000)]
Merge "Fix static analyzer warnings."

8 years agoFix 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

8 years agoMerge "postinst: Update postinstall_example documentation." am: 9be329ae32 am: 11711d63fa
Alex Deymo [Fri, 4 Mar 2016 05:49:13 +0000 (05:49 +0000)]
Merge "postinst: Update postinstall_example documentation." am: 9be329ae32 am: 11711d63fa
am: 318d51fa76

* commit '318d51fa7690722d8fdd7239805b8877ab9c17f6':
  postinst: Update postinstall_example documentation.

8 years agoMerge "postinst: Update postinstall_example documentation." am: 9be329ae32
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.

8 years agoMerge "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.

8 years agoMerge "postinst: Update postinstall_example documentation."
Alex Deymo [Fri, 4 Mar 2016 05:39:49 +0000 (05:39 +0000)]
Merge "postinst: Update postinstall_example documentation."

8 years agoMerge "Cleanup uses of sprintf so we can deprecate it." am: 33f2127b43 am: 4604c8e464
George Burgess IV [Thu, 3 Mar 2016 23:29:20 +0000 (23:29 +0000)]
Merge "Cleanup uses of sprintf so we can deprecate it." am: 33f2127b43 am: 4604c8e464
am: edc2b45d5f

* commit 'edc2b45d5f71ce03162072b76a76de37c199e998':
  Cleanup uses of sprintf so we can deprecate it.

8 years agoMerge "Cleanup uses of sprintf so we can deprecate it." am: 33f2127b43
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoMerge "simpleperf: support building cts test." am: acf5a605e8 am: 50c29925a3
Yabin Cui [Thu, 3 Mar 2016 20:36:37 +0000 (20:36 +0000)]
Merge "simpleperf: support building cts test." am: acf5a605e8 am: 50c29925a3
am: 14d00307fd

* commit '14d00307fd3d10a5f3270f393133e276aedbebca':
  simpleperf: support building cts test.

8 years agoMerge "simpleperf: support building cts test." am: acf5a605e8
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.

8 years agoMerge "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.

8 years agoMerge "simpleperf: support building cts test."
Yabin Cui [Thu, 3 Mar 2016 18:59:38 +0000 (18:59 +0000)]
Merge "simpleperf: support building cts test."

8 years agosimpleperf: 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

8 years agopostinst: Update postinstall_example documentation.
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

8 years agoCleanup uses of sprintf so we can deprecate it.
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

8 years agoAdd support for filtering based on app name to pagecache.
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

8 years agoMerge "simpleperf: fix analyzer warning." am: 5cfed7b49b am: fab91a6086
Yabin Cui [Wed, 2 Mar 2016 20:08:18 +0000 (20:08 +0000)]
Merge "simpleperf: fix analyzer warning." am: 5cfed7b49b am: fab91a6086
am: af75130968

* commit 'af75130968971d45c54961086f44bef90117a24c':
  simpleperf: fix analyzer warning.

8 years agoMerge "simpleperf: fix analyzer warning." am: 5cfed7b49b
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.

8 years agoMerge "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.

8 years agoMerge "simpleperf: fix analyzer warning."
Yabin Cui [Wed, 2 Mar 2016 18:47:52 +0000 (18:47 +0000)]
Merge "simpleperf: fix analyzer warning."

8 years agoMerge "Delete net_test from system/extras now that it\'s in kernel/tests." am: 3669b3...
Lorenzo Colitti [Wed, 2 Mar 2016 08:47:03 +0000 (08:47 +0000)]
Merge "Delete net_test from system/extras now that it\'s in kernel/tests." am: 3669b3f331 am: fb9148766a
am: 186aa47ece

* commit '186aa47ecefdb9cd0d9f4503ce9847075787cd22':
  Delete net_test from system/extras now that it's in kernel/tests.

8 years agoMerge "Delete net_test from system/extras now that it\'s in kernel/tests." am: 3669b3f331
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoFix pagemap_test#maps. am: f018ba35fa
Elliott Hughes [Wed, 2 Mar 2016 07:11:44 +0000 (07:11 +0000)]
Fix pagemap_test#maps. am: f018ba35fa
am: cb5d057383

* commit 'cb5d057383a2b2315d7a12ef25a6ce5051f9e41f':
  Fix pagemap_test#maps.

8 years agosimpleperf: fix analyzer warning.
Yabin Cui [Tue, 1 Mar 2016 22:05:25 +0000 (14:05 -0800)]
simpleperf: fix analyzer warning.

Bug: 27432175
Change-Id: If0e8bc724cf659508726215d515d3df30cbebe6b

8 years agoMerge "Fix one static analyzer warning." am: 63728630cb am: e7afd3a049
Chih-Hung Hsieh [Wed, 2 Mar 2016 03:46:53 +0000 (03:46 +0000)]
Merge "Fix one static analyzer warning." am: 63728630cb am: e7afd3a049
am: d576af9841

* commit 'd576af9841d79e39c83f8d5addae9c30d6ac26f6':
  Fix one static analyzer warning.

8 years agoFix pagemap_test#maps.
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.

8 years agoMerge "Fix one static analyzer warning." am: 63728630cb
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agoFix 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

8 years agoMerge "Fix pagemap_test#maps." am: 5dc5241d77 am: 02235d5d8d
Elliott Hughes [Tue, 1 Mar 2016 20:29:44 +0000 (20:29 +0000)]
Merge "Fix pagemap_test#maps." am: 5dc5241d77 am: 02235d5d8d
am: cd0f481855

* commit 'cd0f4818554b0df2ee7620e4fe60753e3f3bdfbb':
  Fix pagemap_test#maps.

8 years agoMerge "Fix typo in \'help report\' output." am: 4e6f660ab0 am: fe4b8f25e2
Than McIntosh [Tue, 1 Mar 2016 20:19:48 +0000 (20:19 +0000)]
Merge "Fix typo in \'help report\' output." am: 4e6f660ab0 am: fe4b8f25e2
am: 2e6ac5e2e1

* commit '2e6ac5e2e144fea661f90088ebc79eabe3017dd8':
  Fix typo in 'help report' output.

8 years agoFix pagemap_test#maps.
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

8 years agoMerge "Fix pagemap_test#maps." am: 5dc5241d77
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.

8 years agoMerge "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.

8 years agoMerge "Fix pagemap_test#maps."
Elliott Hughes [Tue, 1 Mar 2016 20:06:55 +0000 (20:06 +0000)]
Merge "Fix pagemap_test#maps."

8 years agoMerge "Fix typo in \'help report\' output." am: 4e6f660ab0
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.

8 years agoFix pagemap_test#maps.
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

8 years agoMerge "Fix typo in \'help report\' output."
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.

8 years agoMerge "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."

8 years agoFix 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

8 years agoMerge "simpleperf: fix mac build." am: 9e0f649ea9 am: 99adeea02a
Yabin Cui [Thu, 25 Feb 2016 20:44:16 +0000 (20:44 +0000)]
Merge "simpleperf: fix mac build." am: 9e0f649ea9 am: 99adeea02a
am: c608df15e0

* commit 'c608df15e0bdb6aafe1f4811cd9823cbbe76261c':
  simpleperf: fix mac build.

8 years agoMerge "simpleperf: fix mac build." am: 9e0f649ea9
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.

8 years agoMerge "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.

8 years agoMerge "simpleperf: fix mac build."
Yabin Cui [Thu, 25 Feb 2016 20:36:03 +0000 (20:36 +0000)]
Merge "simpleperf: fix mac build."

8 years agoMerge "simpleperf: port cmd_report_test to nonlinux." am: ec2bf27cb9 am: bfbf46b8fe
Yabin Cui [Thu, 25 Feb 2016 20:16:49 +0000 (20:16 +0000)]
Merge "simpleperf: port cmd_report_test to nonlinux." am: ec2bf27cb9 am: bfbf46b8fe
am: f75c5f6904

* commit 'f75c5f6904412ffa8582383696fe38a08b7b969d':
  simpleperf: port cmd_report_test to nonlinux.

8 years agoMerge "simpleperf: port cmd_report_test to nonlinux." am: ec2bf27cb9
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.

8 years agoMerge "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.

8 years agoMerge "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."

8 years agosimpleperf: fix mac build.
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

8 years agosimpleperf: port cmd_report_test to nonlinux.
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

8 years agoDelete net_test from system/extras now that it's in kernel/tests.
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

8 years agoMerge "Cite more kernel commits." am: e090897280 am: 013f143ed8
Lorenzo Colitti [Thu, 25 Feb 2016 13:25:11 +0000 (13:25 +0000)]
Merge "Cite more kernel commits." am: e090897280 am: 013f143ed8
am: 4aed0d6339

* commit '4aed0d633996506556b4c93b1abae9a73ebd5787':
  Cite more kernel commits.

8 years agoMerge "Cite more kernel commits." am: e090897280
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.

8 years agoMerge "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.

8 years agoMerge "Cite more kernel commits."
Lorenzo Colitti [Thu, 25 Feb 2016 13:13:19 +0000 (13:13 +0000)]
Merge "Cite more kernel commits."

8 years agoDon\'t define incremental ext4 for windows am: ef24424e32
Mohamad Ayyash [Wed, 24 Feb 2016 04:29:12 +0000 (04:29 +0000)]
Don\'t define incremental ext4 for windows am: ef24424e32
am: 2c26ed3c4f

* commit '2c26ed3c4f52fe3f99ce0976e799f9b40f9b8cf8':
  Don't define incremental ext4 for windows

8 years agoDon\'t define incremental ext4 for windows
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

8 years agoDon'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

8 years agoRedesign make_ext4fs to incrementally generate ext4 images am: 9579198cd7
Mohamad Ayyash [Tue, 23 Feb 2016 23:26:37 +0000 (23:26 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images am: 9579198cd7
am: 659fd483b9

* commit '659fd483b9fa0bb3cf16b50b02b8495962f45641':
  Redesign make_ext4fs to incrementally generate ext4 images

8 years agoRedesign make_ext4fs to incrementally generate ext4 images
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

8 years agoRedesign 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>
8 years agoCite more kernel commits.
Lorenzo Colitti [Tue, 23 Feb 2016 14:42:10 +0000 (23:42 +0900)]
Cite more kernel commits.

Change-Id: Ia335d5c8461e7dfb41211977df74422e00012be8