OSDN Git Service
Alex Deymo [Thu, 12 Jan 2017 22:45:58 +0000 (22:45 +0000)]
Remove "_static" and "_host" suffix from libext4_utils definitions. am:
b611070c14 am:
60978bf884 am:
ad602c57c0
am:
aad43c9c5e
Change-Id: I158a5c3b388361d5fdaed237000343caf7a2edb0
Alex Deymo [Thu, 12 Jan 2017 22:45:55 +0000 (22:45 +0000)]
Remove "_host" suffix from libfec_rs. am:
ae12268ee1 am:
bbb970be06 am:
2eb3cc146e
am:
533b435769
Change-Id: I7598ef4640d2b6748f6220327a15498c74da1d93
Alex Deymo [Thu, 12 Jan 2017 21:38:00 +0000 (21:38 +0000)]
Remove "_static" and "_host" suffix from libext4_utils definitions. am:
b611070c14 am:
60978bf884
am:
ad602c57c0
Change-Id: Ie703aace98c7830d66ba6355b78e27805ea04572
Alex Deymo [Thu, 12 Jan 2017 21:37:57 +0000 (21:37 +0000)]
Remove "_host" suffix from libfec_rs. am:
ae12268ee1 am:
bbb970be06
am:
2eb3cc146e
Change-Id: Iae2da8ec47eb015e29b4c7c556de69879387b069
Alex Deymo [Thu, 12 Jan 2017 21:33:00 +0000 (21:33 +0000)]
Remove "_static" and "_host" suffix from libext4_utils definitions. am:
b611070c14
am:
60978bf884
Change-Id: I13e3547ad633ee736c5e0e33e94257c442a47e65
Alex Deymo [Thu, 12 Jan 2017 21:32:57 +0000 (21:32 +0000)]
Remove "_host" suffix from libfec_rs. am:
ae12268ee1
am:
bbb970be06
Change-Id: I47361aa98f4f23624c93176051879f3beebf5dc4
Alex Deymo [Thu, 12 Jan 2017 21:27:57 +0000 (21:27 +0000)]
Remove "_static" and "_host" suffix from libext4_utils definitions.
am:
b611070c14
Change-Id: Ia11b07484b2f9ce5123480c66a7f7bd479c0915b
Alex Deymo [Thu, 12 Jan 2017 21:27:55 +0000 (21:27 +0000)]
Remove "_host" suffix from libfec_rs.
am:
ae12268ee1
Change-Id: I837b363a922cc0642a6bdd77114b1e2ed1b6eb8b
Mark Salyzyn [Thu, 12 Jan 2017 01:14:13 +0000 (01:14 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am:
1c10b4ec13 am:
ab92bfe4dd am:
0d13de9fd7
am:
d09cc8a6c1
Change-Id: I241844f655a1681b4af9ae5e78ca35f23161aebd
Mark Salyzyn [Thu, 12 Jan 2017 01:07:54 +0000 (01:07 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am:
1c10b4ec13 am:
ab92bfe4dd
am:
0d13de9fd7
Change-Id: Id08cda97a8e8b613758d97257512432efcff3f24
Mark Salyzyn [Thu, 12 Jan 2017 01:00:32 +0000 (01:00 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am:
1c10b4ec13
am:
ab92bfe4dd
Change-Id: I20f3b1798f10a24ef6aaf2ee0b6f8b547c9d50b8
Mark Salyzyn [Thu, 12 Jan 2017 00:54:24 +0000 (00:54 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
am:
1c10b4ec13
Change-Id: Iade249345c27b99cfefdf0552270916302f34ea0
Treehugger Robot [Thu, 12 Jan 2017 00:44:06 +0000 (00:44 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
Mark Salyzyn [Tue, 10 Jan 2017 21:32:49 +0000 (13:32 -0800)]
liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug:
30465923
Change-Id: I0c8178ef32006e0ec5f3dde7446b5396cf98df77
Alex Deymo [Wed, 11 Jan 2017 22:03:51 +0000 (14:03 -0800)]
Remove "_static" and "_host" suffix from libext4_utils definitions.
Bug:
34220783
Change-Id: Ia8da0c96a0384826afd8b089101468ac388d0ca2
Alex Deymo [Wed, 11 Jan 2017 19:30:44 +0000 (11:30 -0800)]
Remove "_host" suffix from libfec_rs.
libfec_rs_host is now renamed to libfec_rs.
Bug:
34220783
Change-Id: I70dd794cbf2ed2f118849371379e424159b312a4
TreeHugger Robot [Mon, 9 Jan 2017 20:16:41 +0000 (20:16 +0000)]
Merge "ext4_utils: disable sparse io for e2fsdroid if image is not sparse"
Yabin Cui [Sat, 7 Jan 2017 19:41:36 +0000 (19:41 +0000)]
Merge "simpleperf: fix synchronization when reading mapped buffer." am:
a587ece964 am:
04910bdaab am:
adc709ba79
am:
94d6dfee04
Change-Id: I7f11d4274115a7b0675cc82a1fb812ab265f6b1f
Yabin Cui [Sat, 7 Jan 2017 19:37:07 +0000 (19:37 +0000)]
Merge "simpleperf: fix synchronization when reading mapped buffer." am:
a587ece964 am:
04910bdaab
am:
adc709ba79
Change-Id: I145d1cdf160d5875a34796b9a6ea165dfee82baa
Yabin Cui [Sat, 7 Jan 2017 19:32:37 +0000 (19:32 +0000)]
Merge "simpleperf: fix synchronization when reading mapped buffer." am:
a587ece964
am:
04910bdaab
Change-Id: I5418e8a0579eb188d1af9fab7b478fd3361e678b
Yabin Cui [Sat, 7 Jan 2017 19:28:06 +0000 (19:28 +0000)]
Merge "simpleperf: fix synchronization when reading mapped buffer."
am:
a587ece964
Change-Id: I6f8bca1b8145294adbfad5321a832aa3febf2bb0
Yabin Cui [Sat, 7 Jan 2017 19:23:04 +0000 (19:23 +0000)]
Merge "simpleperf: fix synchronization when reading mapped buffer."
Jin Qian [Sat, 7 Jan 2017 00:39:38 +0000 (16:39 -0800)]
ext4_utils: disable sparse io for e2fsdroid if image is not sparse
Change-Id: I05fda0b9895e0c68730220057de7b7abe1c79930
Yabin Cui [Fri, 6 Jan 2017 23:17:25 +0000 (23:17 +0000)]
Merge "simpleperf: fix annotate.py." am:
9e6a8022f9 am:
4f519c445a am:
a34d6bfd00
am:
7fe1afc8a7
Change-Id: Ia28053891fd6fa6a3c658488df51d09318f309d9
Yabin Cui [Fri, 6 Jan 2017 23:01:42 +0000 (15:01 -0800)]
simpleperf: fix synchronization when reading mapped buffer.
Fixed according to http://lxr.free-electrons.com/source/kernel/events/ring_buffer.c#L61.
Test: run simpleperf_unit_test.
Change-Id: I44486b1630c92de57fb575b502b2d7c798e46e4b
Yabin Cui [Fri, 6 Jan 2017 23:13:24 +0000 (23:13 +0000)]
Merge "simpleperf: fix annotate.py." am:
9e6a8022f9 am:
4f519c445a
am:
a34d6bfd00
Change-Id: I87d4bc0b802b435908f68b7e6a391e90f5ee335c
Yabin Cui [Fri, 6 Jan 2017 23:09:24 +0000 (23:09 +0000)]
Merge "simpleperf: fix annotate.py." am:
9e6a8022f9
am:
4f519c445a
Change-Id: I5af42f6a7b8536a31eda27cd9609fffc60829555
Yabin Cui [Fri, 6 Jan 2017 23:05:24 +0000 (23:05 +0000)]
Merge "simpleperf: fix annotate.py."
am:
9e6a8022f9
Change-Id: I84a8cec3fa66c348aa6f3fc15541ce56dd66f260
Yabin Cui [Fri, 6 Jan 2017 23:00:35 +0000 (23:00 +0000)]
Merge "simpleperf: fix annotate.py."
Yabin Cui [Fri, 6 Jan 2017 20:47:31 +0000 (12:47 -0800)]
simpleperf: fix annotate.py.
Bug: http://b/
32834638
Test: run annotate.py.
Change-Id: I18d6985387a68482a589d812109692ee2c30197c
Yabin Cui [Fri, 6 Jan 2017 19:48:49 +0000 (19:48 +0000)]
Merge "simpleperf: add scripts to sdk build." am:
a29ece7f55 am:
e1172ef700 am:
a00a44e0a5
am:
024e39df10
Change-Id: I3b099e87767221e53eec9520b7a2a060a6cb909d
Yabin Cui [Fri, 6 Jan 2017 19:44:50 +0000 (19:44 +0000)]
Merge "simpleperf: add scripts to sdk build." am:
a29ece7f55 am:
e1172ef700
am:
a00a44e0a5
Change-Id: I10cb7607ce11c5da5d74bca057ba1889b4bad369
Yabin Cui [Fri, 6 Jan 2017 19:41:18 +0000 (19:41 +0000)]
Merge "simpleperf: add scripts to sdk build." am:
a29ece7f55
am:
e1172ef700
Change-Id: I67fb33497f72bdf3087e2a9f7bd52840f50468b1
Yabin Cui [Fri, 6 Jan 2017 19:37:20 +0000 (19:37 +0000)]
Merge "simpleperf: add scripts to sdk build."
am:
a29ece7f55
Change-Id: I44993017ae96a2f122e4edc95e7aea7a89bb572e
Yabin Cui [Fri, 6 Jan 2017 19:31:53 +0000 (19:31 +0000)]
Merge "simpleperf: add scripts to sdk build."
Patrick Tjin [Fri, 6 Jan 2017 18:35:24 +0000 (18:35 +0000)]
make_ext4fs: add option to specify the number of inodes [DO NOT MERGE] am:
7842cd2b14
am:
79004434a2 -s ours
Change-Id: I7f969644859f87529fc83f8d67cf09e6cf476e48
Patrick Tjin [Fri, 6 Jan 2017 18:31:50 +0000 (18:31 +0000)]
make_ext4fs: add option to specify the number of inodes [DO NOT MERGE]
am:
7842cd2b14
Change-Id: I73d33dcfcea39dddddb3cb8b4ba1c1b1c3faf032
Yabin Cui [Fri, 6 Jan 2017 01:58:19 +0000 (17:58 -0800)]
simpleperf: add scripts to sdk build.
Bug: http://b/
32834638
Test: make sdk.
Change-Id: Iffc2649dc131c73758db8727912c83c078d92071
Yabin Cui [Fri, 6 Jan 2017 01:58:55 +0000 (01:58 +0000)]
Merge "simpleperf: update scripts to use binaries in bin/." am:
615135e145 am:
6046606f3e am:
9088b88c7a
am:
e847a2453f
Change-Id: Ib402e26b7af729c8db1ac84d9040c79f306f3a8d
Yabin Cui [Fri, 6 Jan 2017 01:51:58 +0000 (01:51 +0000)]
Merge "simpleperf: update scripts to use binaries in bin/." am:
615135e145 am:
6046606f3e
am:
9088b88c7a
Change-Id: I29b4204832a565c4b17d26929a696ec8f7fd1b5d
Yabin Cui [Fri, 6 Jan 2017 01:47:49 +0000 (01:47 +0000)]
Merge "simpleperf: update scripts to use binaries in bin/." am:
615135e145
am:
6046606f3e
Change-Id: I3fcd94dd7f4b4c4511463b8e6aba407e1c4c2359
Yabin Cui [Fri, 6 Jan 2017 01:42:48 +0000 (01:42 +0000)]
Merge "simpleperf: update scripts to use binaries in bin/."
am:
615135e145
Change-Id: I8337ba5125698c34a36d37f5455fa06acdf3c957
Yabin Cui [Fri, 6 Jan 2017 01:30:53 +0000 (01:30 +0000)]
Merge "simpleperf: update scripts to use binaries in bin/."
Yabin Cui [Thu, 5 Jan 2017 23:44:08 +0000 (15:44 -0800)]
simpleperf: update scripts to use binaries in bin/.
Bug: http://b/
32834638
Test: run python scripts like report_sample.py.
Change-Id: Ia37e7b34babe7ba3df88b38ec6e6bc15241f50d8
Yabin Cui [Thu, 5 Jan 2017 23:16:47 +0000 (23:16 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643." am:
c5775f1239 am:
8df3424b96 am:
4ab5f41bfa
am:
6c8ae66544
Change-Id: Ic65b867170ce7dfe77075ddc02e3f2ed085a9e07
Yabin Cui [Thu, 5 Jan 2017 23:13:16 +0000 (23:13 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643." am:
c5775f1239 am:
8df3424b96
am:
4ab5f41bfa
Change-Id: Ib41afa4ed13c1068628f6c7242b1574e27443cbe
Yabin Cui [Thu, 5 Jan 2017 23:09:46 +0000 (23:09 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643." am:
c5775f1239
am:
8df3424b96
Change-Id: Ie00b60a60f01c73bb8fc280607c1bf0c189da5ec
Yabin Cui [Thu, 5 Jan 2017 23:05:45 +0000 (23:05 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643."
am:
c5775f1239
Change-Id: I913b359c341b5d9b06f6f79b94f8f4980d97f542
Yabin Cui [Thu, 5 Jan 2017 22:58:33 +0000 (22:58 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
3614643."
Yabin Cui [Thu, 5 Jan 2017 20:01:26 +0000 (12:01 -0800)]
simpleperf: update simpleperf prebuilts to build
3614643.
Taken from branch aosp-master.
Bug: http://b/
32834638
Test: None.
Change-Id: I6d456a932f8ab679da4c34f4113dc7414fe29d62
Patrick Tjin [Thu, 20 Oct 2016 17:55:11 +0000 (10:55 -0700)]
make_ext4fs: add option to specify the number of inodes [DO NOT MERGE]
Add option to specify the number of inodes to create when
making the filesystem. Read-only partitions don't have
a need for extra inodes, a lot of space is wasted by these
inodes.
Bug:
32246383
Bug:
33252070
Bug:
33428604
Test: make vendor partition with new options
Change-Id: I7063972ec4f4e617d28d2e029ad6a9f8e94add73
(cherry picked from commit
15c434682ac78262d2dad9730805eab52b748cdf)
wangjiangshao [Thu, 5 Jan 2017 18:41:56 +0000 (18:41 +0000)]
Merge "libfec: add large file which larger than 4G operation support" am:
240aba7e8f am:
0dda84826c am:
4b3f1bcf99
am:
73ddc0132a
Change-Id: Ib1fb68bf42a34fe9667e440257859e87468489cc
wangjiangshao [Thu, 5 Jan 2017 18:38:22 +0000 (18:38 +0000)]
Merge "libfec: add large file which larger than 4G operation support" am:
240aba7e8f am:
0dda84826c
am:
4b3f1bcf99
Change-Id: I25444486be051346d366714010a3c25afafe60f9
Steven Moreland [Thu, 5 Jan 2017 18:37:57 +0000 (18:37 +0000)]
Merge "boot control: remove getInterfaceVersion" am:
9aaf345f02 am:
ac2940eb41 am:
794554ade8
am:
f63de5e4a6
Change-Id: I370a3131208764bacd52def386cd3e4af065eabb
wangjiangshao [Thu, 5 Jan 2017 18:35:23 +0000 (18:35 +0000)]
Merge "libfec: add large file which larger than 4G operation support" am:
240aba7e8f
am:
0dda84826c
Change-Id: I9adf2c558fd04c9fec3a4e90f7f2794bd309593a
Steven Moreland [Thu, 5 Jan 2017 18:34:56 +0000 (18:34 +0000)]
Merge "boot control: remove getInterfaceVersion" am:
9aaf345f02 am:
ac2940eb41
am:
794554ade8
Change-Id: Ie79205e71963e249d5b339c2f0326b07a6820eaf
wangjiangshao [Thu, 5 Jan 2017 18:32:22 +0000 (18:32 +0000)]
Merge "libfec: add large file which larger than 4G operation support"
am:
240aba7e8f
Change-Id: I2561343c51ecf1e76200a19fc17ac30d3999c0a8
Steven Moreland [Thu, 5 Jan 2017 18:31:56 +0000 (18:31 +0000)]
Merge "boot control: remove getInterfaceVersion" am:
9aaf345f02
am:
ac2940eb41
Change-Id: I493de1d3250187005b4e00d34557f20dee04767f
Steven Moreland [Thu, 5 Jan 2017 18:28:26 +0000 (18:28 +0000)]
Merge "boot control: remove getInterfaceVersion"
am:
9aaf345f02
Change-Id: I3f45fdfe70796dddab997656b73da7b4ffaab7c4
Treehugger Robot [Thu, 5 Jan 2017 18:28:05 +0000 (18:28 +0000)]
Merge "libfec: add large file which larger than 4G operation support"
Steven Moreland [Thu, 5 Jan 2017 18:24:11 +0000 (18:24 +0000)]
Merge "boot control: remove getInterfaceVersion"
wangjiangshao [Fri, 30 Dec 2016 14:57:42 +0000 (22:57 +0800)]
libfec: add large file which larger than 4G operation support
Add _LARGEFILE64_SOURCE to handle large files such as larger than 4G,
fix fec_open cannot open file larger than 4G
Bug: https://code.google.com/p/android/issues/detail?id=231508
Test: tested on Android N devices
Change-Id: I8df81a039cb987f6bde36384bf69e8ab119fd515
Signed-off-by: wangjiangshao <wangjiangshao@xiaomi.com>
Yabin Cui [Wed, 4 Jan 2017 23:29:39 +0000 (23:29 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am:
01efd2baca am:
01355680e6 am:
d6276a4df1
am:
80603303b6
Change-Id: Ib5784a8d1243db67c86a982a493b8035b730f76d
Yabin Cui [Wed, 4 Jan 2017 23:24:35 +0000 (23:24 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am:
01efd2baca am:
01355680e6
am:
d6276a4df1
Change-Id: I56808b55932fb5da0194c0ec4155b9a78c9e0f43
Yabin Cui [Wed, 4 Jan 2017 23:20:02 +0000 (23:20 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build.""" am:
01efd2baca
am:
01355680e6
Change-Id: I0748676a7e0ac84079489417f37f682d839eb232
Yabin Cui [Wed, 4 Jan 2017 23:17:03 +0000 (23:17 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build."""
am:
01efd2baca
Change-Id: Ic67f0f1754ca85d2d398d4e3c61032bb00b381c4
Yabin Cui [Wed, 4 Jan 2017 23:12:05 +0000 (23:12 +0000)]
Merge "Revert "Revert "simpleperf: add binaries in sdk build."""
Yabin Cui [Wed, 4 Jan 2017 21:27:26 +0000 (21:27 +0000)]
Revert "Revert "simpleperf: add binaries in sdk build.""
This reverts commit
266cf44be350c02766e9fe988185caeb224d0769.
And fix error in the original patch.
Bug: http://b/
32834638
Test: make x86-sdk and mips-sdk.
Change-Id: Ie9bc21ca461252f54c8f443747c8d9d1b5d33c02
Steven Moreland [Wed, 4 Jan 2017 21:00:07 +0000 (13:00 -0800)]
boot control: remove getInterfaceVersion
getInterfaceVersion doesn't provide any information and is being
removed. I've replaced the call with interfaceChain here so that a
better description can be obtained.
Bug:
34041669
Test: compiles
Change-Id: I00e5154e92edf2dd17b3e899b094589642ba3b3e
Yabin Cui [Wed, 4 Jan 2017 02:53:09 +0000 (02:53 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build."" am:
b4cdbd535c am:
2f596464fd am:
46561919cc
am:
54d903a021
Change-Id: If32060a8ed49a52d1dcb93d57ed7ce98052b9ff8
Yabin Cui [Wed, 4 Jan 2017 02:50:36 +0000 (02:50 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build."" am:
b4cdbd535c am:
2f596464fd
am:
46561919cc
Change-Id: I92595632d10dde1eb890895107e20c73ab80f162
Yabin Cui [Wed, 4 Jan 2017 02:48:41 +0000 (02:48 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build."" am:
b4cdbd535c
am:
2f596464fd
Change-Id: I6969919508873bc4065849a70a9436329db603bb
Yabin Cui [Wed, 4 Jan 2017 02:46:39 +0000 (02:46 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build.""
am:
b4cdbd535c
Change-Id: I62d6a3c61a9502daeb54c1b970515aa112dcf8ac
Yabin Cui [Wed, 4 Jan 2017 02:43:11 +0000 (02:43 +0000)]
Merge "Revert "simpleperf: add binaries in sdk build.""
Yabin Cui [Wed, 4 Jan 2017 02:41:21 +0000 (02:41 +0000)]
Revert "simpleperf: add binaries in sdk build."
This reverts commit
f6bc6f2e59a2f45c0e341be3a994363d99525986.
Change-Id: Ic8a2405372498ef8251bcf4b680408001c164550
Yabin Cui [Wed, 4 Jan 2017 02:13:47 +0000 (02:13 +0000)]
Merge "simpleperf: add binaries in sdk build." am:
507df68b78 am:
a9db82bfe9 am:
26edd04c6b
am:
1f614bc1c1
Change-Id: I36b276b23760fa7e09ff6c2aa624cee07422cf86
Yabin Cui [Wed, 4 Jan 2017 02:11:46 +0000 (02:11 +0000)]
Merge "simpleperf: add binaries in sdk build." am:
507df68b78 am:
a9db82bfe9
am:
26edd04c6b
Change-Id: Id4e647422b6e7e42508165a59f48c08d053aec26
Yabin Cui [Wed, 4 Jan 2017 02:09:46 +0000 (02:09 +0000)]
Merge "simpleperf: add binaries in sdk build." am:
507df68b78
am:
a9db82bfe9
Change-Id: Ie87f8e105b4323e3fb0fdfd723735a82d55a80eb
Yabin Cui [Wed, 4 Jan 2017 02:07:44 +0000 (02:07 +0000)]
Merge "simpleperf: add binaries in sdk build."
am:
507df68b78
Change-Id: I567466800dcf0fdae7602f1bd13ea530bea4d35a
Yabin Cui [Wed, 4 Jan 2017 02:02:26 +0000 (02:02 +0000)]
Merge "simpleperf: add binaries in sdk build."
TreeHugger Robot [Tue, 3 Jan 2017 23:07:52 +0000 (23:07 +0000)]
Merge "mkuserimg_mke2fs: fix issues creating images"
Yabin Cui [Mon, 19 Dec 2016 18:28:54 +0000 (10:28 -0800)]
simpleperf: add binaries in sdk build.
Build 32/64 bit simpleperf on target, simpleperf on host,
and libsimpleperf_report.so on host in sdk. So they can
be used in prebuilts/simpleperf.
Bug: http://b/
32834638
Test: make sdk and win_sdk manually.
Change-Id: I1e55c9b1596aca3b982dc30422d29d830077289e
Jaekyun Seok [Wed, 28 Dec 2016 01:41:10 +0000 (01:41 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one." am:
3248ec90dc am:
a49a613353 am:
4cc3629f6d
am:
62e3398cf2
Change-Id: I388cafa8c0d0f7393b26fb6fa281fe835b4e2f5d
Jaekyun Seok [Wed, 28 Dec 2016 01:33:10 +0000 (01:33 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one." am:
3248ec90dc am:
a49a613353
am:
4cc3629f6d
Change-Id: I7eac801864c6cef233f855c841ac6951e976fb1a
Jaekyun Seok [Wed, 28 Dec 2016 01:25:39 +0000 (01:25 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one." am:
3248ec90dc
am:
a49a613353
Change-Id: I27c9ed3df31418720ffe080eb1f27cb547ded43a
Jaekyun Seok [Wed, 28 Dec 2016 01:18:09 +0000 (01:18 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one."
am:
3248ec90dc
Change-Id: I18fd202bd200662d2b579d4d10f9a4fbde7254ae
Treehugger Robot [Wed, 28 Dec 2016 01:07:29 +0000 (01:07 +0000)]
Merge "Use shared lib of libselinux in runconuid instead of static one."
The Android Automerger [Wed, 28 Dec 2016 00:34:12 +0000 (00:34 +0000)]
Manually merge commit '
96ace71'
* commit '
96ace71':
kernel.config: aslr test exception in std:stoll
Mark Salyzyn [Tue, 27 Dec 2016 22:36:59 +0000 (22:36 +0000)]
Merge "kernel.config: aslr test exception in std:stoll" am:
55f50c6a4c am:
dbccaa45b5
am:
3ed08f1718
Change-Id: I8793485f3211e834d6461531ae1b374c9c8d03f5
Mark Salyzyn [Tue, 27 Dec 2016 22:29:29 +0000 (22:29 +0000)]
Merge "kernel.config: aslr test exception in std:stoll" am:
55f50c6a4c
am:
dbccaa45b5
Change-Id: I4c83b9c53ae26167696d0aa8114d481a8581848f
Mark Salyzyn [Tue, 27 Dec 2016 22:21:59 +0000 (22:21 +0000)]
Merge "kernel.config: aslr test exception in std:stoll"
am:
55f50c6a4c
Change-Id: Ia46be19245b3d9cfd8fa117614fc0a957cd63bbd
Treehugger Robot [Tue, 27 Dec 2016 22:14:58 +0000 (22:14 +0000)]
Merge "kernel.config: aslr test exception in std:stoll"
Mark Salyzyn [Tue, 27 Dec 2016 20:31:13 +0000 (12:31 -0800)]
kernel.config: aslr test exception in std:stoll
Test: no more exception failures
Bug:
33846158
Change-Id: Iaaa43affae3a42cf5b94bed84ab94197d3d4d2d1
Yifan Hong [Thu, 22 Dec 2016 18:43:54 +0000 (18:43 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
6bf42db77d am:
495022d1d3 am:
83f440739e
am:
47fccea026
Change-Id: If62d1ed0eb914a6272d3d6d185912d735bfd9131
Yifan Hong [Thu, 22 Dec 2016 18:23:37 +0000 (18:23 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
6bf42db77d am:
495022d1d3
am:
83f440739e
Change-Id: Ia6e1d11760d24a6f64956805f2e56849b5e94f15
Yifan Hong [Thu, 22 Dec 2016 18:19:15 +0000 (18:19 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
6bf42db77d
am:
495022d1d3
Change-Id: I0801a914c6f2c902a52b528eb650578853f853a1
Yifan Hong [Thu, 22 Dec 2016 18:16:19 +0000 (18:16 +0000)]
Merge "Update for hiding Status from Return<T> object."
am:
6bf42db77d
Change-Id: I3182b9170f826a9757e0c92b2a63d3f4a7b457d9
Yifan Hong [Thu, 22 Dec 2016 18:04:15 +0000 (18:04 +0000)]
Merge "Update for hiding Status from Return<T> object."
Jin Qian [Thu, 22 Dec 2016 17:53:03 +0000 (09:53 -0800)]
Revert "ioshark: A Repeatable Application Workload Based Storage Benchmark."
This reverts commit
99c8f98f2a9c76fabb19cdbc5b495978cfc479b3.
Change-Id: Id205f175802d55b8f12342f82199db5743e479dc
Jin Qian [Thu, 22 Dec 2016 16:48:32 +0000 (08:48 -0800)]
ioshark: fix mac build break
Change-Id: Iefd18cc8ebfe462231292e30397467410e9f0511
OSDN Git Service
