OSDN Git Service
Rom Lemarchand [Tue, 17 May 2016 18:45:54 +0000 (18:45 +0000)]
Merge "pagingtest: switch to advising random accesses" am:
5263409f21 am:
682242bc44
am:
f1d3010875
* commit '
f1d30108758cf6396fbaaa3890ed1c333717e59d':
pagingtest: switch to advising random accesses
Change-Id: I7513992a555fcf236ed725cc9d6918966821c7a9
Rom Lemarchand [Tue, 17 May 2016 18:37:44 +0000 (18:37 +0000)]
Merge "pagingtest: switch to advising random accesses" am:
5263409f21
am:
682242bc44
* commit '
682242bc4491f75168b8c7469a4bbba59d24f99b':
pagingtest: switch to advising random accesses
Change-Id: Ib916350d037aed877d95820b864d5fdf66f8ef4d
Rom Lemarchand [Tue, 17 May 2016 18:34:58 +0000 (18:34 +0000)]
Merge "pagingtest: switch to advising random accesses"
am:
5263409f21
* commit '
5263409f213c63366a1cd6a2af9307eab65f6fbf':
pagingtest: switch to advising random accesses
Change-Id: Ib6e335f9614d1cfdfa9c2794b17d0b30b62e8a3f
Rom Lemarchand [Tue, 17 May 2016 18:17:38 +0000 (18:17 +0000)]
Merge "pagingtest: switch to advising random accesses"
Yabin Cui [Tue, 17 May 2016 16:51:27 +0000 (16:51 +0000)]
Merge "simpleperf: fix stat scale output." am:
5767273e98 am:
c6a9228f27
am:
1d5085905d
* commit '
1d5085905d21c6d1bbd99012100a0aa51c3fe051':
simpleperf: fix stat scale output.
Change-Id: I999793e6337d33596c442805836f441b2e6ee005
Yabin Cui [Tue, 17 May 2016 16:48:56 +0000 (16:48 +0000)]
Merge "simpleperf: fix stat scale output." am:
5767273e98
am:
c6a9228f27
* commit '
c6a9228f276736d69905facff4c5068317c33c6e':
simpleperf: fix stat scale output.
Change-Id: Ia5baf75dd3d20330f09a4029dae5b7ae477cc72c
Yabin Cui [Tue, 17 May 2016 16:46:33 +0000 (16:46 +0000)]
Merge "simpleperf: fix stat scale output."
am:
5767273e98
* commit '
5767273e98eb1a17827f0eb95612fb3fb4d6f12c':
simpleperf: fix stat scale output.
Change-Id: I7fbd77aa36046827b81e866c2eb1ecc53e4a60ba
Yabin Cui [Tue, 17 May 2016 16:39:03 +0000 (16:39 +0000)]
Merge "simpleperf: fix stat scale output."
Rom Lemarchand [Tue, 17 May 2016 03:17:41 +0000 (20:17 -0700)]
pagingtest: switch to advising random accesses
Switch to using madvise(MADV_RANDOM) and posix_fadvise(POSIX_FADV_RANDOM)
to disable caching as opposed to reading the file backwards, which still
went through some caching.
Measured a 80% drop in worst case performance after switching.
Change-Id: I03115dfb94ae7dfc58e0e187af3936c4e371817f
Yabin Cui [Tue, 17 May 2016 03:07:26 +0000 (20:07 -0700)]
simpleperf: fix stat scale output.
Currently simpleperf stat command create an event file for each cpu and
scale the result by summarizing counters on each cpu. But one thread only
runs on one cpu at a time, so it results in wrongly scaled numbers.
Fix this by three changes:
1. For non system-wide stat, Create only one event file for all cpus.
2. When summarizing counters, omit counters having 0 running time.
3. Print real value instead of scaled value.
Run command:
$simpleperf stat ./empty_program
Before the change:
Performance counter statistics:
33,540,176 cpu-cycles # 54.812986 GHz (2%)
28,233,348 stalled-cycles-frontend # 46.140 G/sec (2%)
After the change:
Performance counter statistics:
625,335 cpu-cycles # 1.404496 GHz (100%)
507,200 stalled-cycles-frontend # 1.139 G/sec (100%)
Change-Id: I76bc3e220df4f149ab365e960295b24fde8ae2fc
Mohamad Ayyash [Fri, 13 May 2016 20:31:15 +0000 (20:31 +0000)]
resolve merge conflicts of
2107558 to nyc-dev-plus-aosp
am:
98a47b842c
* commit '
98a47b842cb23669ba747d1b0e40f85745d2f330':
Remove canned_fs_config from ext4_utils
Change-Id: I3dd87e5304fa8f52e794de60c94086973f473a4b
Xin Li [Fri, 13 May 2016 20:22:03 +0000 (13:22 -0700)]
resolve merge conflicts of
2107558 to nyc-dev-plus-aosp
Change-Id: Icdabd960bfab6d6d683b1dc01bc2795ccfb5bcde
Mohamad Ayyash [Fri, 13 May 2016 18:22:59 +0000 (18:22 +0000)]
Merge "Remove canned_fs_config from ext4_utils"
am:
b1b964214b
* commit '
b1b964214babaddd0f0bd758c54f7fac4fbe4bf7':
Remove canned_fs_config from ext4_utils
Change-Id: Ied3b2507e6462f2e64a135c4ceca2a4c18320253
Treehugger Robot [Fri, 13 May 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Remove canned_fs_config from ext4_utils"
Mark Salyzyn [Fri, 13 May 2016 16:52:13 +0000 (16:52 +0000)]
Merge "lockdep_chains: graph visualization" am:
bfe42baeae am:
b50ec7f672
am:
9a4de94fe1
* commit '
9a4de94fe123ce522061def772d1abab5125ba55':
lockdep_chains: graph visualization
Change-Id: Icaaf4a2b18c528456506e9293d0d7f86fcf84f6e
Mark Salyzyn [Fri, 13 May 2016 16:49:26 +0000 (16:49 +0000)]
Merge "lockdep_chains: graph visualization" am:
bfe42baeae
am:
b50ec7f672
* commit '
b50ec7f672ab8d54a5f10e09db3d3e190b9bb6a8':
lockdep_chains: graph visualization
Change-Id: I35bdaa5a8993b7c67f267952354fa8f8cffedb65
Mark Salyzyn [Fri, 13 May 2016 16:46:55 +0000 (16:46 +0000)]
Merge "lockdep_chains: graph visualization"
am:
bfe42baeae
* commit '
bfe42baeaea18fd633b047a2464b482d1660bdf4':
lockdep_chains: graph visualization
Change-Id: I6d9ce11582e0e3e3e045c89dde50238477945aeb
Mark Salyzyn [Fri, 13 May 2016 16:42:33 +0000 (16:42 +0000)]
Merge "lockdep_chains: graph visualization"
Mark Salyzyn [Thu, 12 May 2016 17:48:25 +0000 (10:48 -0700)]
lockdep_chains: graph visualization
Create the system/extras/tools directory for simple analysis helpers.
Publish a host tool helper script that aids visualization of kernel
runtime collected lock dependencies. Helpful to look for circular
locks, or to get a handle on locking order used in a driver.
Bug:
28310683
Change-Id: Ib52c23f4cdefb37882232eff11b943eeb1b2abfa
Mohamad Ayyash [Fri, 8 Apr 2016 05:15:57 +0000 (22:15 -0700)]
Remove canned_fs_config from ext4_utils
It is now also used in mksquashfs so it was added to libcutils
BUG:
27467028
Change-Id: I81c87938d5b6b200a8ad817f0c64c5ca699f451c
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG:
28704419
Paul Lawrence [Wed, 11 May 2016 22:20:40 +0000 (22:20 +0000)]
Add fileencrypted=software/ice to fstab options
am:
e8299d81a1
* commit '
e8299d81a18d16b006019f37ec9d84921d5ff845':
Add fileencrypted=software/ice to fstab options
Change-Id: I29a1b2f0f3c1382e412c2e8f51bd644bd5301ff4
Paul Lawrence [Thu, 5 May 2016 18:01:42 +0000 (11:01 -0700)]
Add fileencrypted=software/ice to fstab options
Bug:
28616054
Change-Id: I34257870d388993d168f6541ef51ee2ce1067a7e
Android Build Merger (Role) [Tue, 10 May 2016 22:20:08 +0000 (22:20 +0000)]
Merge "Fail with an error if we can\'t read the policy for encryption am:
8d53b9619b am:
fa85e9f0c4" into nyc-mr1-dev-plus-aosp
Paul Crowley [Tue, 10 May 2016 22:19:59 +0000 (22:19 +0000)]
Fail with an error if we can\'t read the policy for encryption am:
8d53b9619b
am:
fa85e9f0c4
* commit '
fa85e9f0c45f29d4d2c724f11b3db3019e486999':
Fail with an error if we can't read the policy for encryption
Change-Id: Ib530c0e2a67e65dcc8c4b54739a689de38058116
Paul Crowley [Tue, 10 May 2016 22:19:57 +0000 (22:19 +0000)]
Fail with an error if we can\'t read the policy for encryption am:
8d53b9619b
am:
a698367412
* commit '
a69836741263a7f8f48a5884123151e0d98238c6':
Fail with an error if we can't read the policy for encryption
Change-Id: I47a4f4320fe45016eaede8e33ffd4241aa64e0a4
Paul Crowley [Tue, 10 May 2016 22:17:23 +0000 (22:17 +0000)]
Fail with an error if we can\'t read the policy for encryption
am:
8d53b9619b
* commit '
8d53b9619ba913354ffdb23acf0108f7445bb8bc':
Fail with an error if we can't read the policy for encryption
Change-Id: I56e185bc0ee583d3a966e072dc34ed24af21ed39
Paul Crowley [Tue, 10 May 2016 22:17:21 +0000 (22:17 +0000)]
Fail with an error if we can\'t read the policy for encryption
am:
8d53b9619b
* commit '
8d53b9619ba913354ffdb23acf0108f7445bb8bc':
Fail with an error if we can't read the policy for encryption
Change-Id: I2c77a648bf5ef8b5d208662c4deb28e593e52be1
Paul Crowley [Wed, 27 Apr 2016 17:24:40 +0000 (10:24 -0700)]
Fail with an error if we can't read the policy for encryption
The absence of a policy reference in the unencrypted directory now
causes e4crypt_set_directory_policy to fail with an error. Callers
should call e4crypt_is_native (now moved into here) before calling this.
Bug:
28318405
Change-Id: I209292aba3abad3b19105c9afe2b84e8b3dd6874
Ying Wang [Fri, 6 May 2016 22:32:38 +0000 (22:32 +0000)]
Fix LOCAL_CPP_EXTENSION.
am:
421efce14c
* commit '
421efce14c802c76c384ff6265c907e006628b77':
Fix LOCAL_CPP_EXTENSION.
Change-Id: I11fe7d6c2c88f0b250ba46b2ec0fdfbc3a5e38fd
Ying Wang [Fri, 6 May 2016 02:41:11 +0000 (19:41 -0700)]
Fix LOCAL_CPP_EXTENSION.
Bug:
28622149
Change-Id: I785b9bdf90f77ed87c41542f3bd010c6b7356069
(cherry picked from commit
070b6199012eaf0c962f2ff4313551b13735198d)
Ying Wang [Fri, 6 May 2016 20:39:54 +0000 (20:39 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION." am:
2597f3521e am:
abe624c78e
am:
52d8960892
* commit '
52d896089282a7b651cd2eb4adac719b63e14c8a':
Fix LOCAL_CPP_EXTENSION.
Change-Id: Ie190a5d2b689d7e655b3955a64095b4f2ea45cfb
Ying Wang [Fri, 6 May 2016 20:34:06 +0000 (20:34 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION." am:
2597f3521e
am:
abe624c78e
* commit '
abe624c78e1a0c24581fd10cddf450369293576c':
Fix LOCAL_CPP_EXTENSION.
Change-Id: I564c7020ee90c1d46a21ff908592b41bbc94d4c8
Ying Wang [Fri, 6 May 2016 20:29:33 +0000 (20:29 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION."
am:
2597f3521e
* commit '
2597f3521efd5e6f999ad9aa1e0e3dd6304ba3e4':
Fix LOCAL_CPP_EXTENSION.
Change-Id: I572c5c6810b888b2580c01db31ee2a0eecb7c9b6
Treehugger Robot [Fri, 6 May 2016 20:16:40 +0000 (20:16 +0000)]
Merge "Fix LOCAL_CPP_EXTENSION."
Chih-Hung Hsieh [Fri, 6 May 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea7e4f7cbc am:
c3aa198a1d
am:
dc979ddf26
* commit '
dc979ddf26c33b4105fe7d18fc4336315020eef4':
Fix google-explicit-constructor warnings.
Change-Id: Id21fe372cb6b1f21ff91c2034314ceceaa0ec140
Chih-hung Hsieh [Fri, 6 May 2016 19:08:08 +0000 (19:08 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea7e4f7cbc
am:
c3aa198a1d
* commit '
c3aa198a1d972780cfa719099d08edfabb57aacf':
Fix google-explicit-constructor warnings.
Change-Id: I57c7856998a157bef4b2da37418618a00757c590
Chih-Hung Hsieh [Fri, 6 May 2016 19:03:21 +0000 (19:03 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
ea7e4f7cbc
* commit '
ea7e4f7cbc86e8363b1771cc848d026e0faa6400':
Fix google-explicit-constructor warnings.
Change-Id: Ie8972db88d6ad1e009e27bfb4ad99d890d37ec5b
Chih-hung Hsieh [Fri, 6 May 2016 18:46:10 +0000 (18:46 +0000)]
Merge "Fix google-explicit-constructor warnings."
Ying Wang [Fri, 6 May 2016 02:41:11 +0000 (19:41 -0700)]
Fix LOCAL_CPP_EXTENSION.
Bug:
28622149
Change-Id: I785b9bdf90f77ed87c41542f3bd010c6b7356069
Chih-Hung Hsieh [Fri, 6 May 2016 17:41:04 +0000 (10:41 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I420d23cc1f7ed44e1d9a215ee6815afab365046e
Android Build Merger (Role) [Fri, 29 Apr 2016 19:21:22 +0000 (19:21 +0000)]
Merge "Incr Ext4: Properly merge block_allocation lists am:
f7124d6c95 am:
821577708c" into nyc-mr1-dev-plus-aosp
Mohamad Ayyash [Fri, 29 Apr 2016 19:21:13 +0000 (19:21 +0000)]
Incr Ext4: Properly merge block_allocation lists am:
f7124d6c95
am:
821577708c
* commit '
821577708ced07714ebae35b2df4b9fe94de8b8b':
Incr Ext4: Properly merge block_allocation lists
Change-Id: I3e12122a8c392b4fc78e0a33208a18efc4fccfde
Mohamad Ayyash [Fri, 29 Apr 2016 19:21:12 +0000 (19:21 +0000)]
Incr Ext4: Properly merge block_allocation lists am:
f7124d6c95
am:
d0b885aac2
* commit '
d0b885aac219c7bef2ffb631fa4ccf8b6f7b289f':
Incr Ext4: Properly merge block_allocation lists
Change-Id: I9243ffcd7a6283382023a95b5bb9b57196d88f5d
Mohamad Ayyash [Fri, 29 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Incr Ext4: Properly merge block_allocation lists
am:
f7124d6c95
* commit '
f7124d6c955c0453361b0ff47c5c94619e68087f':
Incr Ext4: Properly merge block_allocation lists
Change-Id: I9d343f1762c183aaf4cacd9f7fd613af174896e3
Mohamad Ayyash [Fri, 29 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Incr Ext4: Properly merge block_allocation lists
am:
f7124d6c95
* commit '
f7124d6c955c0453361b0ff47c5c94619e68087f':
Incr Ext4: Properly merge block_allocation lists
Change-Id: Ie6e931abfe5744d17496dac823a6c2605b35fa5d
Mohamad Ayyash [Fri, 29 Apr 2016 18:21:52 +0000 (18:21 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations am:
d2ed02a940
am:
8f2325882f
* commit '
8f2325882fa8d6613184b7fe31562f727264e611':
Change-Id: Ib4a577f4d99d74f1d0b12878de571617826b4719
Mohamad Ayyash [Fri, 29 Apr 2016 18:20:42 +0000 (18:20 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations am:
d2ed02a940
am:
2592d45099
* commit '
2592d45099fecb384753d3fb9a3bc88a25c56296':
Incremental Ext4 Bug: prevent out of bound boundary allocations
Change-Id: I1894ee81c58c593ca4ea87a877483afeec74024a
Mohamad Ayyash [Fri, 29 Apr 2016 18:18:27 +0000 (18:18 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
am:
d2ed02a940
* commit '
d2ed02a94086e1221041bc59825add3d0a657e19':
Incremental Ext4 Bug: prevent out of bound boundary allocations
Change-Id: Ic521ccfd6402e3419e9471edd5996b05596c12bc
Mohamad Ayyash [Fri, 29 Apr 2016 18:18:24 +0000 (18:18 +0000)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
am:
d2ed02a940
* commit '
d2ed02a94086e1221041bc59825add3d0a657e19':
Incremental Ext4 Bug: prevent out of bound boundary allocations
Change-Id: I25c596b4db090b92ad475fb211e4b43a7dd2856b
Mohamad Ayyash [Fri, 29 Apr 2016 18:14:02 +0000 (11:14 -0700)]
Incr Ext4: Properly merge block_allocation lists
BUG:
27698960
Change-Id: Ia31b8319e0d1c8644ae1798116007a4b35c39e9b
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mohamad Ayyash [Fri, 29 Apr 2016 04:49:01 +0000 (21:49 -0700)]
Incremental Ext4 Bug: prevent out of bound boundary allocations
This happens around the boundary of block groups where a slightly
different block boundary is set based on size of filesystem which means
allocations based on a previous filesystem layout need to verify they're
not crossing that new bounday
BUG:
27698960
Change-Id: I45d444b4477f14f71e8f17144523505a7525b4e2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Chih-Hung Hsieh [Wed, 27 Apr 2016 21:40:02 +0000 (21:40 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
b1304be am:
c4515b5
am:
ff0c7e0
* commit '
ff0c7e070707735c7534b8a2ab820f9f49057ce7':
Fix google-explicit-constructor warnings.
Change-Id: I29ba498a61291bfed87e5af615ef662aae7fc41a
Treehugger Robot [Wed, 27 Apr 2016 21:25:25 +0000 (21:25 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
b1304be
am:
c4515b5
* commit '
c4515b505123815839f0ee672741e82423aa72e6':
Fix google-explicit-constructor warnings.
Change-Id: I39d53b09a735a6e0604ce153e4f6e8f4257473ce
Chih-Hung Hsieh [Wed, 27 Apr 2016 21:22:56 +0000 (21:22 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
b1304be
* commit '
b1304be7031f83401561c469c7f8624f76a2f007':
Fix google-explicit-constructor warnings.
Change-Id: I3ba62da5bbe74437c3ec0ddc9c7a68557b4e1e0d
Treehugger Robot [Wed, 27 Apr 2016 21:09:34 +0000 (21:09 +0000)]
Merge "Fix google-explicit-constructor warnings."
Yabin Cui [Tue, 26 Apr 2016 18:18:03 +0000 (18:18 +0000)]
Merge "simpleperf: improve cpu_hotplug tests." am:
75726c6 am:
9499f0e
am:
06558af
* commit '
06558af7730d9f11ac4a6061a59941026213e44e':
simpleperf: improve cpu_hotplug tests.
Change-Id: I4a94ab4063bd7d358808ec7900e8169dab94ad38
Yabin Cui [Tue, 26 Apr 2016 18:14:55 +0000 (18:14 +0000)]
Merge "simpleperf: improve cpu_hotplug tests." am:
75726c6
am:
9499f0e
* commit '
9499f0e9f3d87a59e473bdd55e5582c8402db845':
simpleperf: improve cpu_hotplug tests.
Change-Id: Ide267393ce6095ec9b1733704af25bb5a0854553
Yabin Cui [Tue, 26 Apr 2016 18:11:41 +0000 (18:11 +0000)]
Merge "simpleperf: improve cpu_hotplug tests."
am:
75726c6
* commit '
75726c65d973cd9ab139221a0c8a60a0fab98f6b':
simpleperf: improve cpu_hotplug tests.
Change-Id: I76aee490bb5dc9d68d6038b5888a10554d20a65c
Yabin Cui [Tue, 26 Apr 2016 17:55:49 +0000 (17:55 +0000)]
Merge "simpleperf: improve cpu_hotplug tests."
Yabin Cui [Mon, 18 Apr 2016 20:43:20 +0000 (13:43 -0700)]
simpleperf: improve cpu_hotplug tests.
Add cpu hotplug test for ioctl(PERF_EVENT_IOC_ENABLE),
and improve cpu_hotplug tests by removing sleep calls.
Bug:
28384580
Change-Id: I5869cd9bb3086b6f3a73cf7dce4ffd720326c3c6
Chih-Hung Hsieh [Tue, 26 Apr 2016 16:24:09 +0000 (16:24 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
7ec2e36 am:
1ce5f21
am:
78a73fa
* commit '
78a73fa7d54981b33c281bbdbd6bbb45b0c73a04':
Fix google-explicit-constructor warnings.
Change-Id: Icea693feaa98b21cd529c4ef1deab454d73a3432
Chih-hung Hsieh [Tue, 26 Apr 2016 16:21:09 +0000 (16:21 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
7ec2e36
am:
1ce5f21
* commit '
1ce5f21453f7132537bb684933cfc37cccef8c42':
Fix google-explicit-constructor warnings.
Change-Id: I49921e86b37c68a53825b91a0515a93eaf416193
Chih-Hung Hsieh [Tue, 26 Apr 2016 16:17:49 +0000 (16:17 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
7ec2e36
* commit '
7ec2e36c128a0f83aed3addbcf8a672f5dda9966':
Fix google-explicit-constructor warnings.
Change-Id: I3539bfe25d634b34fe1700abb0df183ac880ba17
Chih-hung Hsieh [Tue, 26 Apr 2016 16:14:44 +0000 (16:14 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 25 Apr 2016 23:15:55 +0000 (23:15 +0000)]
resolve merge conflicts of
acc275a to nyc-dev-plus-aosp
am:
2f94665
* commit '
2f94665879231866f0395bc2d9df369a4562e0db':
Fix google-explicit-constructor warnings.
Change-Id: I03bf59b672bbf33bb88da7e475f63a5f8eadc65a
Chih-Hung Hsieh [Mon, 25 Apr 2016 23:00:19 +0000 (23:00 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a8bbf56 am:
6ed77d3
am:
e1d4c71
* commit '
e1d4c714b382b29130f3737e5382bd57a700d4b3':
Fix google-explicit-constructor warnings.
Change-Id: Icc0efafe84364a481ea6578e78f05222febd43e6
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)]
resolve merge conflicts of
acc275a to nyc-dev-plus-aosp
Change-Id: Ia8f82614a3501d631c074667dfebc5e56e142752
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:38:52 +0000 (22:38 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
84a6923
* commit '
84a692306714a11873879242fdadcf956234ad7e':
Fix google-explicit-constructor warnings.
Change-Id: Ib5ab8226bc8235cababee5773f7f6bb9959986fd
Chih-hung Hsieh [Mon, 25 Apr 2016 22:38:37 +0000 (22:38 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a8bbf56
am:
6ed77d3
* commit '
6ed77d30d5a077bafa0cba78d61bb6a60d8695d0':
Fix google-explicit-constructor warnings.
Change-Id: Ib8105abcdf0638e3c15dbf7cc7c67768b4a09d17
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:32:40 +0000 (22:32 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
a8bbf56
* commit '
a8bbf56210501d3cb724bd4f2709a9c3feb5d205':
Fix google-explicit-constructor warnings.
Change-Id: I4ebf442e2a709d906784170f62c56302e5057f09
Chih-hung Hsieh [Mon, 25 Apr 2016 22:30:17 +0000 (22:30 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Mon, 25 Apr 2016 22:21:09 +0000 (22:21 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:17:14 +0000 (14:17 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I9f388006f5593b9f224e98e93deca7da35c5618a
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:12:26 +0000 (14:12 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I1825b4e58c7c82e247a3be9cbe1139fa2b79f151
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:08:08 +0000 (14:08 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: Ie9d9c33b48b179917f084e59a4e595c6eb972adf
Chih-Hung Hsieh [Mon, 25 Apr 2016 21:01:30 +0000 (14:01 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I871beda49b122df7680ab712f7116469d343ad8f
Yabin Cui [Mon, 25 Apr 2016 19:34:53 +0000 (19:34 +0000)]
Merge "simpleperf: always build static binary on device." am:
7035e8f am:
00f5b93
am:
9d66645
* commit '
9d66645a017780daab86776a14c37c1ba2ad832b':
simpleperf: always build static binary on device.
Change-Id: Ifd3a82960d10801fed3d63eb38e72285f8d46cfe
Yabin Cui [Mon, 25 Apr 2016 19:23:24 +0000 (19:23 +0000)]
Merge "simpleperf: always build static binary on device." am:
7035e8f
am:
00f5b93
* commit '
00f5b939f6055fbdc6452194046202653605b06e':
simpleperf: always build static binary on device.
Change-Id: Ic5dae793c72dd1b7539a4e1a9c0ff6e5ad7ffbd3
Yabin Cui [Mon, 25 Apr 2016 19:17:58 +0000 (19:17 +0000)]
Merge "simpleperf: always build static binary on device."
am:
7035e8f
* commit '
7035e8f0cf0a952d58f867839cd96794d59ae50a':
simpleperf: always build static binary on device.
Change-Id: I7177d294d3dfdc682fae876a56592dd5339b56a4
Yabin Cui [Mon, 25 Apr 2016 19:02:42 +0000 (19:02 +0000)]
Merge "simpleperf: always build static binary on device."
Android Build Merger (Role) [Tue, 19 Apr 2016 01:08:57 +0000 (01:08 +0000)]
Merge "make_ext4fs: Modify ext4 filesystem setup to speed up fsck am:
dedf8f9705 am:
fcd9c189be" into nyc-mr1-dev-plus-aosp
Mohamad Ayyash [Tue, 19 Apr 2016 01:08:52 +0000 (01:08 +0000)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck am:
dedf8f9705
am:
5a32b99f6a
* commit '
5a32b99f6abd85c9b3d030baf1c7269233bc626e':
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
Change-Id: I7588d07132f8d6aad0fee65ea72ca63eb6d3d391
Mohamad Ayyash [Tue, 19 Apr 2016 01:08:52 +0000 (01:08 +0000)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck am:
dedf8f9705
am:
fcd9c189be
* commit '
fcd9c189be0cad44fc677ea4f1d91f0010fa91c6':
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
Change-Id: I6c22a391d242b98ed1efa1afd71fc3913831ba7d
Mohamad Ayyash [Tue, 19 Apr 2016 01:06:38 +0000 (01:06 +0000)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
am:
dedf8f9705
* commit '
dedf8f9705df13e1fd07d3f754216d34725bb269':
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
Change-Id: If03e8e8ef5ea07d979e8049beaf8301cc590beb3
Mohamad Ayyash [Tue, 19 Apr 2016 01:06:38 +0000 (01:06 +0000)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
am:
dedf8f9705
* commit '
dedf8f9705df13e1fd07d3f754216d34725bb269':
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
Change-Id: I07364ec2112966eff463ece718aa530887e5a36f
Chih-Hung Hsieh [Mon, 18 Apr 2016 21:39:12 +0000 (21:39 +0000)]
Merge "Fix some google-runtime-int warnings." am:
0add9c5 am:
73dcd46
am:
48cd796
* commit '
48cd7967ba91fd001cf44c11044a10f69204719e':
Fix some google-runtime-int warnings.
Change-Id: Ide69c25d25fcd21906d474a8411a36fa478e1ed8
Chih-hung Hsieh [Mon, 18 Apr 2016 21:32:52 +0000 (21:32 +0000)]
Merge "Fix some google-runtime-int warnings." am:
0add9c5
am:
73dcd46
* commit '
73dcd46a9120f1acb2259b6b2ad9bb4fe98f5b38':
Fix some google-runtime-int warnings.
Change-Id: Ia506ca817826d5e03af3e7ec69abb72adff20226
Chih-Hung Hsieh [Mon, 18 Apr 2016 21:27:26 +0000 (21:27 +0000)]
Merge "Fix some google-runtime-int warnings."
am:
0add9c5
* commit '
0add9c5b35041af781e1433ae0790167e7b3277f':
Fix some google-runtime-int warnings.
Change-Id: Ieb19b039ca854953d38ce23ab378f3c5d3ec1495
Chih-hung Hsieh [Mon, 18 Apr 2016 20:48:53 +0000 (20:48 +0000)]
Merge "Fix some google-runtime-int warnings."
Mohamad Ayyash [Fri, 15 Apr 2016 02:43:31 +0000 (19:43 -0700)]
make_ext4fs: Modify ext4 filesystem setup to speed up fsck
1) Set EXT4_BG_INODE_UNINIT so fsck will skip scanning unused inodes
2) Use EXT4_FEATURE_RO_COMPAT_GDT_CSUM to enable group descriptor
checksums in filesystem which reduces overhead for fsck
BUG:
24747200
BUG:
28013112
Change-Id: I118ab26935442f452962b3a7c29c61acf76ad4d9
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Chih-Hung Hsieh [Fri, 15 Apr 2016 23:12:03 +0000 (16:12 -0700)]
Fix some google-runtime-int warnings.
Bug:
28220065
Change-Id: Ic6b24216d216bbb165a1420b52b11c7703b810a0
Yabin Cui [Fri, 15 Apr 2016 03:19:14 +0000 (03:19 +0000)]
simpleperf: use libbacktrace_offline static library.
am:
2362310 -s ours
* commit '
2362310b546b157eeee352e72b1585363002d662':
simpleperf: use libbacktrace_offline static library.
Change-Id: Ie1c65dc55664ab5ca1583a979b7233ae05391783
Yabin Cui [Thu, 14 Apr 2016 23:35:00 +0000 (16:35 -0700)]
simpleperf: always build static binary on device.
Bug:
28199918
Change-Id: I7008e6e7c0de60521bc7ae5f1b7ee4fd2d57cf04
Yabin Cui [Thu, 14 Apr 2016 04:28:54 +0000 (21:28 -0700)]
simpleperf: use libbacktrace_offline static library.
Device may not have libbacktrace_offline shared library, so always
using libbacktrace_offline static library.
Use simpleperf namespace to avoid conflicts with ThreadEntry in
libbacktrace.
Bug:
28152982
Change-Id: Ia2cdbee3b28556c790ccd7b061a801ed96f9b97c
(cherry picked from commit
040f7b4c62ce49f0af0746640e94d415764262cd)
Yabin Cui [Thu, 14 Apr 2016 21:38:25 +0000 (21:38 +0000)]
Merge "simpleperf: use libbacktrace_offline static library." am:
3952d8b
am:
670994c
* commit '
670994cffc767d20ca76284b16e06f7c9e3ec477':
simpleperf: use libbacktrace_offline static library.
Change-Id: I15c88d2ddec684d144a7a2fcf8b6117604a086d7
Yabin Cui [Thu, 14 Apr 2016 21:34:27 +0000 (21:34 +0000)]
Merge "simpleperf: use libbacktrace_offline static library."
am:
3952d8b
* commit '
3952d8b5c84c1efcd1136a6d2dca0022cfefcf3a':
simpleperf: use libbacktrace_offline static library.
Change-Id: I15fce7d59ceae949ae7dca496a3445bc873b4f65
Yabin Cui [Thu, 14 Apr 2016 21:14:54 +0000 (21:14 +0000)]
Merge "simpleperf: use libbacktrace_offline static library."
Yabin Cui [Thu, 14 Apr 2016 04:28:54 +0000 (21:28 -0700)]
simpleperf: use libbacktrace_offline static library.
Device may not have libbacktrace_offline shared library, so always
using libbacktrace_offline static library.
Use simpleperf namespace to avoid conflicts with ThreadEntry in
libbacktrace.
Bug:
28152982
Change-Id: Ia2cdbee3b28556c790ccd7b061a801ed96f9b97c
Treehugger Robot [Wed, 13 Apr 2016 17:38:44 +0000 (17:38 +0000)]
Merge "verity: delete keystore_signer" am:
6e6aa65
am:
21d49d9
* commit '
21d49d921661d49ffaac87ee3ad601778a563d19':
verity: delete keystore_signer
Change-Id: Ic4d0600aa0e49930636e6568a42d325efd93c2ae
Sami Tolvanen [Wed, 13 Apr 2016 17:35:19 +0000 (17:35 +0000)]
Merge "verity: delete keystore_signer"
am:
6e6aa65
* commit '
6e6aa65411432adee75005558e1bb6056fd9d77a':
verity: delete keystore_signer
Change-Id: I39c15949d9a4be171feb0f386bfd33bb1d81514e