OSDN Git Service
Lorenzo Colitti [Mon, 22 Feb 2016 01:41:25 +0000 (01:41 +0000)]
Merge "Teach iproute how to dump IP addresses as well." am:
9e73f5af39
am:
8660fb3ed4
* commit '
8660fb3ed4b26884d59e49cb9254a9bfee8a7b83':
Teach iproute how to dump IP addresses as well.
Lorenzo Colitti [Mon, 22 Feb 2016 01:38:07 +0000 (01:38 +0000)]
Merge "Teach iproute how to dump IP addresses as well."
am:
9e73f5af39
* commit '
9e73f5af39c035f25b0ac081e999907865789f9e':
Teach iproute how to dump IP addresses as well.
Lorenzo Colitti [Mon, 22 Feb 2016 01:33:06 +0000 (01:33 +0000)]
Merge "Teach iproute how to dump IP addresses as well."
Lorenzo Colitti [Sun, 21 Feb 2016 13:45:09 +0000 (22:45 +0900)]
Teach iproute how to dump IP addresses as well.
Change-Id: I38b5182d9110d72758c48da4d0edc7cf0fb84283
Mohamad Ayyash [Fri, 19 Feb 2016 21:23:41 +0000 (21:23 +0000)]
Revert "Redesign make_ext4fs to incrementally generate ext4 images"
am:
18785a86a3
* commit '
18785a86a30135ac65b88db9886bfc22d6608849':
Revert "Redesign make_ext4fs to incrementally generate ext4 images"
Mohamad Ayyash [Fri, 19 Feb 2016 21:16:34 +0000 (21:16 +0000)]
Revert "Redesign make_ext4fs to incrementally generate ext4 images"
This reverts commit
3d960843a2260a98c8df5cc39ca0dbf3d675f1a2.
Change-Id: I0fb7d65f094feb4013924685270fc847693b6889
Mohamad Ayyash [Fri, 19 Feb 2016 19:39:28 +0000 (19:39 +0000)]
Redesign make_ext4fs to incrementally generate ext4 images
am:
3d960843a2
* commit '
3d960843a2260a98c8df5cc39ca0dbf3d675f1a2':
Redesign make_ext4fs to incrementally generate ext4 images
Mohamad Ayyash [Sat, 13 Feb 2016 05:40:52 +0000 (21:40 -0800)]
Redesign make_ext4fs to incrementally generate ext4 images
Allows passing a blk mapping file through -Z which preserves the
location of those mapping in existing files
Internal Design Doc: go/incremental-ext4
BUG:
26839493
Change-Id: I447873bf65ae66dab9923e5a11c497f0722750df
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Yabin Cui [Thu, 18 Feb 2016 20:42:22 +0000 (20:42 +0000)]
Merge "simpleperf: fix build by removing off64_t." am:
21ac023d8e
am:
9a1b2a7509
* commit '
9a1b2a7509d0d6fce954f18e9441088d77a851de':
simpleperf: fix build by removing off64_t.
Yabin Cui [Thu, 18 Feb 2016 20:35:28 +0000 (20:35 +0000)]
Merge "simpleperf: fix build by removing off64_t."
am:
21ac023d8e
* commit '
21ac023d8e90b61f4e82e3952a2f706f7db1038a':
simpleperf: fix build by removing off64_t.
Yabin Cui [Thu, 18 Feb 2016 20:26:56 +0000 (20:26 +0000)]
Merge "simpleperf: 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
Yabin Cui [Thu, 18 Feb 2016 18:40:36 +0000 (18:40 +0000)]
Merge "simpleperf: report symbols of native libraries in apk file." am:
88a0a38c86
am:
dcf41e35f3
* commit '
dcf41e35f315f2fd07bcae5808bb2a7ec4b7c456':
simpleperf: report symbols of native libraries in apk file.
Yabin Cui [Thu, 18 Feb 2016 18:33:34 +0000 (18:33 +0000)]
Merge "simpleperf: report symbols of native libraries in apk file."
am:
88a0a38c86
* commit '
88a0a38c86f34d1169fee5a66cc98bc3cc5ac30e':
simpleperf: report symbols of native libraries in apk file.
Yabin Cui [Thu, 18 Feb 2016 18:22:51 +0000 (18:22 +0000)]
Merge "simpleperf: 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
Bill Yi [Wed, 17 Feb 2016 20:46:08 +0000 (20:46 +0000)]
Bill Yi [Wed, 17 Feb 2016 17:51:16 +0000 (09:51 -0800)]
Lorenzo Colitti [Wed, 17 Feb 2016 06:11:24 +0000 (06:11 +0000)]
Merge changes I871eb6a2,Ied6f5aae,I226a41e7
am:
64e447eb40
* commit '
64e447eb40d5edd86b415e252c584802608fae26':
Add a test for the behaviour of FIN_WAIT sockets.
Make the bytecode tests a bit more robust.
Rename DisableLinger to DisableFinWait, and add an EnableFinWait.
Lorenzo Colitti [Wed, 17 Feb 2016 06:03:08 +0000 (06:03 +0000)]
Merge changes I871eb6a2,Ied6f5aae,I226a41e7
* changes:
Add a test for the behaviour of FIN_WAIT sockets.
Make the bytecode tests a bit more robust.
Rename DisableLinger to DisableFinWait, and add an EnableFinWait.
Yabin Cui [Tue, 16 Feb 2016 21:52:11 +0000 (21:52 +0000)]
Merge "simpleperf: accept different perf_attr sizes."
am:
1d06628497
* commit '
1d06628497bcf090cbb749c73d89f22167fe1281':
simpleperf: accept different perf_attr sizes.
Yabin Cui [Tue, 16 Feb 2016 21:28:16 +0000 (21:28 +0000)]
Merge "simpleperf: 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.
Change-Id: Ia42617f92acb3ab6ae56eb91aa0d7b73efc0b8af
Lorenzo Colitti [Tue, 16 Feb 2016 16:17:10 +0000 (16:17 +0000)]
Merge "Improve sock_diag debugging code."
am:
b1180e2c76
* commit '
b1180e2c76bed73f2ea2e7fbd3c02adc7eea9bcf':
Improve sock_diag debugging code.
Lorenzo Colitti [Tue, 16 Feb 2016 16:07:15 +0000 (01:07 +0900)]
Add a test for the behaviour of FIN_WAIT sockets.
Change-Id: I871eb6a2d3ff889417e6ed02661c8d9a41980e61
Lorenzo Colitti [Tue, 16 Feb 2016 16:05:54 +0000 (01:05 +0900)]
Make the bytecode tests a bit more robust.
They used to require that there were no TCP sockets on the system
at all. Now they only require that there be no established
sockets. Not a huge improvement, but it does make it possible to
write tests that leave-non established sockets around after they
terminate.
Change-Id: Ied6f5aae3b6cf4a5bd25aa4fbeac637010e1f0e8
Lorenzo Colitti [Tue, 16 Feb 2016 15:42:58 +0000 (00:42 +0900)]
Rename DisableLinger to DisableFinWait, and add an EnableFinWait.
Change-Id: I226a41e7eed6cc5bda04f1fb3a0f1889a10408c0
Lorenzo Colitti [Tue, 16 Feb 2016 16:08:28 +0000 (16:08 +0000)]
Merge "Improve sock_diag debugging code."
Dimitry Ivanov [Sat, 13 Feb 2016 04:53:22 +0000 (04:53 +0000)]
Merge "Add missing liblog dependency"
am:
4b99605a60
* commit '
4b99605a6057326ced14eda85c0851f306ce062f':
Add missing liblog dependency
Dimitry Ivanov [Sat, 13 Feb 2016 04:44:24 +0000 (04:44 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 02:43:40 +0000 (18:43 -0800)]
Add missing liblog dependency
Bug: http://b/
27171986
Change-Id: I508d3cfbcb9e026b0f4a086fc6dd1adeffbffcc3
Dimitry Ivanov [Sat, 13 Feb 2016 01:31:55 +0000 (01:31 +0000)]
Merge "Add missing liblog dependency"
am:
aa068b31a6
* commit '
aa068b31a600d645e81f847df88a04b8547a957a':
Add missing liblog dependency
Dimitry Ivanov [Sat, 13 Feb 2016 00:31:18 +0000 (00:31 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 00:28:49 +0000 (16:28 -0800)]
Add missing liblog dependency
Bug: http://b/
27171986
Change-Id: Ifef160cce7f64cd95ceb121e1c311e52352174c4
Chih-hung Hsieh [Fri, 12 Feb 2016 20:08:59 +0000 (20:08 +0000)]
Merge "Fix clang warnings and leak of full_stats_file ."
am:
a72dd92554
* commit '
a72dd92554fd9fbadbddbf1ad2dcd308f6de7fff':
Fix clang warnings and leak of full_stats_file .
Chih-hung Hsieh [Fri, 12 Feb 2016 20:08:47 +0000 (20:08 +0000)]
Merge "Fix memory leak of dirbuf."
am:
dc0cfc06df
* commit '
dc0cfc06dfb1824851a5be66e60ece97d4a012b8':
Fix memory leak of dirbuf.
Chih-hung Hsieh [Fri, 12 Feb 2016 20:02:48 +0000 (20:02 +0000)]
Merge "Fix clang warnings and leak of full_stats_file ."
Chih-hung Hsieh [Fri, 12 Feb 2016 19:56:41 +0000 (19:56 +0000)]
Merge "Fix memory leak of dirbuf."
Chih-Hung Hsieh [Fri, 12 Feb 2016 19:16:19 +0000 (11:16 -0800)]
Fix memory leak of dirbuf.
BUG:
26962062
Change-Id: I5fae9eed5b154205a6780fb28c59fccf0b5b16ec
Chih-Hung Hsieh [Fri, 12 Feb 2016 19:32:33 +0000 (11:32 -0800)]
Fix clang warnings and leak of full_stats_file .
BUG:
27121040
Change-Id: I33a218c7746509278e1222cd5dbd6d4876405b28
Mark Salyzyn [Thu, 11 Feb 2016 23:59:28 +0000 (23:59 +0000)]
Merge "rtc_time: test agent timeouts"
am:
f3a337aa9f
* commit '
f3a337aa9ffab5da6133f0ace06701559c4fde58':
rtc_time: test agent timeouts
Mark Salyzyn [Thu, 11 Feb 2016 23:54:10 +0000 (23:54 +0000)]
rtc_time: test agent timeouts
am:
2b2efb53fa
* commit '
2b2efb53fa6b0f8cb3e41d13c665d88181a5cd4e':
rtc_time: test agent timeouts
Mark Salyzyn [Thu, 11 Feb 2016 23:04:35 +0000 (15:04 -0800)]
rtc_time: test agent timeouts
(cherry pick from commit
9258225ece5d6816ddf9a45e45fb694142c32761)
Break the test up into four, keeping each well below the 60 second
timeout for the test agents. Overhead for the splitting up is an
additional 10 seconds in order to complete all four of the tests
instead of one. typical single test completion is 22.5 seconds.
Change-Id: If8e9a6c7dfd505a9fbc73e9248be4eb2b61521e5
Mark Salyzyn [Thu, 11 Feb 2016 23:45:46 +0000 (23:45 +0000)]
Merge "rtc_time: test agent timeouts"
Mark Salyzyn [Thu, 11 Feb 2016 23:04:35 +0000 (15:04 -0800)]
rtc_time: test agent timeouts
Break the test up into four, keeping each well below the 60 second
timeout for the test agents. Overhead for the splitting up is an
additional 10 seconds in order to complete all four of the tests
instead of one. typical single test completion is 22.5 seconds.
Change-Id: If8e9a6c7dfd505a9fbc73e9248be4eb2b61521e5
Todd Kjos [Thu, 11 Feb 2016 23:03:21 +0000 (23:03 +0000)]
Changes for mtp8996
am:
33e78d360e
* commit '
33e78d360ed3cfc1267fc893942082e5d27d0aa9':
Changes for mtp8996
Todd Kjos [Thu, 11 Feb 2016 00:52:36 +0000 (16:52 -0800)]
Changes for mtp8996
Change-Id: I5fe5c365226087af47aaf7c5a576b7f2622f804d
Yabin Cui [Thu, 11 Feb 2016 18:35:42 +0000 (18:35 +0000)]
Merge "simpleperf: support building static binary on target."
am:
ec255673dc
* commit '
ec255673dc853bcf9a829ea0f476d4fd2f1d4a67':
simpleperf: support building static binary on target.
Yabin Cui [Thu, 11 Feb 2016 18:29:30 +0000 (18:29 +0000)]
Merge "simpleperf: support building static binary on target."
Kenny Root [Thu, 11 Feb 2016 12:44:20 +0000 (12:44 +0000)]
Track update to bouncycastle 1.54
am:
8474f49bc8
* commit '
8474f49bc8f9d4c72ca53e99fc41dc8e434f5a5b':
Track update to bouncycastle 1.54
Kenny Root [Wed, 10 Feb 2016 23:30:56 +0000 (15:30 -0800)]
Track update to bouncycastle 1.54
(cherry-picked from
ab9a0c802d88ff47f3467fd66415a27f8f141b19)
Change-Id: I87252e179e191c6210d26e4055bee03fb43d8ba7
Yabin Cui [Wed, 10 Feb 2016 19:29:51 +0000 (11:29 -0800)]
simpleperf: support building static binary on target.
Bug:
27125711
Change-Id: I7e951c9ffb3e056d05a2b3567f482c6862a3a5b3
Sergio Giro [Wed, 10 Feb 2016 23:38:59 +0000 (23:38 +0000)]
Merge "Track update to bouncycastle 1.54"
am:
7a71552b86
* commit '
7a71552b8691ee6e3722744a49832d7e08defb1f':
Track update to bouncycastle 1.54
Sergio Giro [Wed, 10 Feb 2016 23:34:49 +0000 (23:34 +0000)]
Merge "Track update to bouncycastle 1.54"
Mark Salyzyn [Wed, 10 Feb 2016 23:32:23 +0000 (23:32 +0000)]
Merge "Add kernel config tests" into nyc-dev
am:
13781df2a4
* commit '
13781df2a4d308904d9207f6465fa953f706242e':
Add kernel config tests
Kenny Root [Wed, 10 Feb 2016 23:30:56 +0000 (15:30 -0800)]
Track update to bouncycastle 1.54
Change-Id: I87252e179e191c6210d26e4055bee03fb43d8ba7
Mark Salyzyn [Wed, 10 Feb 2016 23:29:52 +0000 (23:29 +0000)]
Merge "Add kernel config tests" into nyc-dev
Mark Salyzyn [Wed, 10 Feb 2016 22:00:14 +0000 (14:00 -0800)]
Add kernel config tests
(cherry pick from commit
7129c7dcd20bf57cf3a64ec224e4ebac81c8cd88)
A simple start to simple day. Check for evidence of following CONFIGs:
CONFIG_MMC_BLOCK_MAX_SPEED=y
CONFIG_IPV6=y
CONFIG_IP_MULTICAST=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_PMSG=y
CONFIG_SYSVIPC is not set
ToDo: Evidence for all configs in android/configs/android-base.cfg
and android/configs/android-recommended.cfg. Most are not
possible to directly discover, this is performed on a best
effort basis.
Bug:
19173869
Bug:
26559308
Change-Id: I0447334fab7781579fab10610d2f7ac1d34e6044
Mark Salyzyn [Wed, 10 Feb 2016 23:26:32 +0000 (23:26 +0000)]
Merge "Add kernel config tests"
am:
1de27a8b66
* commit '
1de27a8b66fb5f417d475dccd5d97910c7411866':
Add kernel config tests
Mark Salyzyn [Wed, 10 Feb 2016 23:20:17 +0000 (23:20 +0000)]
Merge "Add kernel config tests"
Mark Salyzyn [Wed, 10 Feb 2016 22:00:14 +0000 (14:00 -0800)]
Add kernel config tests
A simple start to simple day. Check for evidence of following CONFIGs:
CONFIG_MMC_BLOCK_MAX_SPEED=y
CONFIG_IPV6=y
CONFIG_IP_MULTICAST=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_PMSG=y
CONFIG_SYSVIPC is not set
ToDo: Evidence for all configs in android/configs/android-base.cfg
and android/configs/android-recommended.cfg. Most are not
possible to directly discover, this is performed on a best
effort basis.
Bug:
19173869
Bug:
26559308
Change-Id: I0447334fab7781579fab10610d2f7ac1d34e6044
Yabin Cui [Wed, 10 Feb 2016 20:03:32 +0000 (20:03 +0000)]
Merge "simpleperf: port read_apk and read_apk/read_elf tests to nonlinux."
am:
796b070487
* commit '
796b0704878a54eabf7a90df507d3442ddb47833':
simpleperf: port read_apk and read_apk/read_elf tests to nonlinux.
Yabin Cui [Wed, 10 Feb 2016 19:21:54 +0000 (19:21 +0000)]
Merge "simpleperf: port read_apk and read_apk/read_elf tests to nonlinux."
Paul Lawrence [Tue, 9 Feb 2016 22:33:41 +0000 (22:33 +0000)]
Encrypt /data/misc
am:
8b11474652
* commit '
8b11474652db4f2b7b5c979259619764842175b8':
Encrypt /data/misc
Paul Lawrence [Tue, 9 Feb 2016 22:23:52 +0000 (14:23 -0800)]
Encrypt /data/misc
Now we have a workaround for
26989796 (we don't touch /data/misc/vold
thanks to:
https://googleplex-android-review.git.corp.google.com/#/c/862867
) we can check this in and remove the need for a data wipe when we land
the proper kernel fix for this issue (stop caching negative file lookups
through a key change)
Bug:
26989796
Change-Id: I83e6b8395b2c6a607b692dc9cf71183b13680071
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
Sami Tolvanen [Mon, 8 Feb 2016 19:10:49 +0000 (19:10 +0000)]
Merge "libfec: fix thread count calculation"
am:
7c7c508ffc
* commit '
7c7c508ffce4240eb11fc6a3f09edbe8916aef3a':
libfec: fix thread count calculation
Sami Tolvanen [Mon, 8 Feb 2016 19:00:57 +0000 (19:00 +0000)]
Merge "libfec: fix thread count calculation"
Sami Tolvanen [Mon, 8 Feb 2016 18:54:27 +0000 (10:54 -0800)]
libfec: fix thread count calculation
On systems with a large number of cores, smallish reads may not be
able to utilize all the cores. Correctly compute the number of threads
we should use.
Change-Id: I7a05c144c2b83a2f6083c33a686ced32cce576c4
Christopher Ferris [Sat, 6 Feb 2016 01:02:29 +0000 (01:02 +0000)]
Merge "Add __s32 define." am:
9d63018815
am:
7991c03404
* commit '
7991c034048ee5b376a16fb71f9f4b0a3354623d':
Add __s32 define.
Christopher Ferris [Sat, 6 Feb 2016 01:00:24 +0000 (01:00 +0000)]
Merge "Add __s32 define."
am:
9d63018815
* commit '
9d630188159868589992116dd5d67cecf17bf257':
Add __s32 define.
Christopher Ferris [Sat, 6 Feb 2016 00:55:51 +0000 (00:55 +0000)]
Merge "Add __s32 define."
Christopher Ferris [Sat, 6 Feb 2016 00:53:13 +0000 (16:53 -0800)]
Add __s32 define.
This is needed for the new v4.4.1 kernel headers.
Bug:
23789423
Change-Id: I3053cdf895793c38ff1af41ebb560c13fda23215
Jeff Sharkey [Wed, 3 Feb 2016 22:30:33 +0000 (15:30 -0700)]
Add methods to get and ensure encryption policy.
The ensure call will either assign an encryption policy, or verify
that an existing policy matches the expected value. Uses the new
logging library so that customers can pivot logs into whatever
location they want: vold into logcat and init into dmesg.
Also add new directories that will have user-specific encryption
policy set on them so we avoid setting the default policy.
Bug:
25796509
Change-Id: Ia535630092822c80cde0939d8e46e6b47d9be2d8
Lorenzo Colitti [Fri, 5 Feb 2016 03:58:07 +0000 (12:58 +0900)]
Improve sock_diag debugging code.
- Unbreak GetConstantName on modules that contain constants whose
names start with "INET_DIAG_BC".
- Honour NL_DEBUG when sending dump requests.
- Decode sock_diag messages differently depending on whether
they are requests or responses.
- Print sock_diag bytecode hex-encoded instead of raw.
Change-Id: I3cc20ab635d1ff4f137aa0f9ff0ff88b1a37ce72
Paul Lawrence [Thu, 4 Feb 2016 18:37:13 +0000 (10:37 -0800)]
Remove unencrypted properties
Change-Id: I59596be7c7df9151f4966a5051f06bcb087345dd
Than McIntosh [Wed, 3 Feb 2016 13:22:33 +0000 (13:22 +0000)]
Merge "Support profiling of shared libs embedded in APKs." am:
4a5dafcc30
am:
615711f7ca
* commit '
615711f7ca31518f72392d79d8a8aff3efb4ae34':
Support profiling of shared libs embedded in APKs.
Than McIntosh [Wed, 3 Feb 2016 12:39:22 +0000 (12:39 +0000)]
Merge "Support profiling of shared libs embedded in APKs."
am:
4a5dafcc30
* commit '
4a5dafcc3093d55fc9d135b9a18c73bd96bcf3b1':
Support profiling of shared libs embedded in APKs.
Than McIntosh [Wed, 3 Feb 2016 12:00:41 +0000 (12:00 +0000)]
Merge "Support profiling of shared libs embedded in APKs."
Dan Albert [Wed, 3 Feb 2016 03:59:29 +0000 (03:59 +0000)]
Merge "Stop living in the \'80s." am:
1a5e41d3a1
am:
3778bcf5b3
* commit '
3778bcf5b36fe0bd4f48a930fa0a68020e912803':
Stop living in the '80s.
Dan Albert [Wed, 3 Feb 2016 03:57:34 +0000 (03:57 +0000)]
Merge "Stop living in the \'80s."
am:
1a5e41d3a1
* commit '
1a5e41d3a1a7c1289503643d88748516649383ed':
Stop living in the '80s.
Dan Albert [Wed, 3 Feb 2016 03:53:23 +0000 (03:53 +0000)]
Merge "Stop living in the '80s."
Dan Albert [Wed, 3 Feb 2016 03:52:41 +0000 (19:52 -0800)]
Stop living in the '80s.
Build fix for GCC.
Change-Id: I2215913647a95897dc39b862696e395a1ebcf208
Dan Albert [Wed, 3 Feb 2016 02:31:25 +0000 (02:31 +0000)]
Merge "Fix warnings in system/extras." am:
4eb09a62f2
am:
1b0f797a72
* commit '
1b0f797a7274737468be7259ed9fde448b54af14':
Fix warnings in system/extras.
Dan Albert [Wed, 3 Feb 2016 02:29:09 +0000 (02:29 +0000)]
Merge "Fix warnings in system/extras."
am:
4eb09a62f2
* commit '
4eb09a62f2fc5f29747afd199dd1072d949b4892':
Fix warnings in system/extras.
Dan Albert [Wed, 3 Feb 2016 02:25:12 +0000 (02:25 +0000)]
Merge "Fix warnings in system/extras."
Dan Albert [Tue, 2 Feb 2016 23:35:33 +0000 (15:35 -0800)]
Fix warnings in system/extras.
Bug: http://b/
26936282
Change-Id: I1b9c6c9bb06944c32abcb871279d056eea0fb11a
Than McIntosh [Tue, 2 Feb 2016 00:50:20 +0000 (19:50 -0500)]
Support profiling of shared libs embedded in APKs.
Some APKs contain shared libraries that the linker handles
by mmap'ing directly from their APKs (if the library is
uncompressed and the proper manifest flag is set). With
this patch simpleperf now breaks out samples on a per-li
basis and reports the name of the lib within the APK.
Example output:
Cmdline: /system/xbin/simpleperf record -a sleep 30
Samples: 140672 of event 'cpu-cycles'
Event count:
84111474884
Overhead Command Pid Tid Shared Object
90.22% b_open_from_apk 19066 19066
/data/app/com.android.frameworks.coretests.install_jni_lib_open_from_apk-2/base.apk!lib/armeabi-v7a/libgcdstuff.so
4.85% b_open_from_apk 19066 19066
/data/app/com.android.frameworks.coretests.install_jni_lib_open_from_apk-2/base.apk!lib/armeabi-v7a/libframeworks_coretests_jni.so
1.19% simpleperf 19085 19085 /system/lib/libc.so
...
Bug:
22560619
Change-Id: I1e0f2e155e03b33935eac24e104c3fd7b9a7e33c
Paul Lawrence [Tue, 2 Feb 2016 23:16:18 +0000 (23:16 +0000)]
Merge "Remove e4crypt_non_default_key"
Chih-hung Hsieh [Tue, 2 Feb 2016 19:47:07 +0000 (19:47 +0000)]
Merge "Fix/suppress potential memory leaks warnings." am:
dd681db9a7
am:
350c15c642
* commit '
350c15c6422e80be1fd1da7cb5849c1de2aca51c':
Fix/suppress potential memory leaks warnings.
Chih-hung Hsieh [Tue, 2 Feb 2016 19:44:03 +0000 (19:44 +0000)]
Merge "Fix/suppress potential memory leaks warnings."
am:
dd681db9a7
* commit '
dd681db9a7978abeb783af206406cfcae0b8514d':
Fix/suppress potential memory leaks warnings.
Chih-hung Hsieh [Tue, 2 Feb 2016 19:40:10 +0000 (19:40 +0000)]
Merge "Fix/suppress potential memory leaks warnings."
Chih-Hung Hsieh [Tue, 2 Feb 2016 18:49:50 +0000 (10:49 -0800)]
Fix/suppress potential memory leaks warnings.
* One simple problem fixed by calling free.
* Others are suppressed since we don't care memory leaks
in this soon-to-be-obsolete test program.
BUG:
26910807
Change-Id: I5ac10115db9644b53e9e8b5fd40a5dc87b2019dc
Paul Lawrence [Tue, 2 Feb 2016 18:38:38 +0000 (10:38 -0800)]
Remove e4crypt_non_default_key
Change:
https://googleplex-android-review.git.corp.google.com/#/c/857155
means this is no longer called since it is assumed always to be false
Change-Id: I12755ca26e33b8eeafaab3b5373a2d0f1c7abf46
Yabin Cui [Tue, 2 Feb 2016 09:13:42 +0000 (09:13 +0000)]
Merge "simpleperf: use RemoveFileIfExists in libbase." am:
ab8ec9ca0e
am:
b138c1e1d2
* commit '
b138c1e1d2c47f4a9ea36ec5252083fa17e916b0':
simpleperf: use RemoveFileIfExists in libbase.
Yabin Cui [Tue, 2 Feb 2016 06:26:57 +0000 (06:26 +0000)]
Merge "simpleperf: use RemoveFileIfExists in libbase."
am:
ab8ec9ca0e
* commit '
ab8ec9ca0e96425b22867deb311fe9dde3db14ea':
simpleperf: use RemoveFileIfExists in libbase.
Yabin Cui [Tue, 2 Feb 2016 06:23:38 +0000 (06:23 +0000)]
Merge "simpleperf: use RemoveFileIfExists in libbase."
Yabin Cui [Tue, 2 Feb 2016 02:07:03 +0000 (18:07 -0800)]
simpleperf: use RemoveFileIfExists in libbase.
Change-Id: Ife16103a5ec86cc6ee2aee4838d1a56a91f54516
Paul Crowley [Mon, 1 Feb 2016 20:41:27 +0000 (20:41 +0000)]
Merge "Give init the means to invoke "cryptfs init_user0""
Paul Crowley [Mon, 1 Feb 2016 16:33:50 +0000 (16:33 +0000)]
Give init the means to invoke "cryptfs init_user0"
Init needs to initialize user 0 for FBE devices via a vdc command.
Bug:
26704408
Change-Id: Ide6d1fdcb55e87c22820310c6d1cf9640e77d25e