Dan Albert
d2d55d6906
am 9b5b2d2c: am ca1797ae: Merge "Remove the stlport linked libbacktrace."
...
* commit '9b5b2d2c23d85699d30c104e0ca9535dd21fe87d':
Remove the stlport linked libbacktrace.
2014-11-12 22:27:56 +00:00
Dan Albert
9b5b2d2c23
am ca1797ae: Merge "Remove the stlport linked libbacktrace."
...
* commit 'ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346':
Remove the stlport linked libbacktrace.
2014-11-12 22:21:47 +00:00
Dan Albert
ca1797ae00
Merge "Remove the stlport linked libbacktrace."
2014-11-12 22:12:34 +00:00
Dan Albert
c7c75cd483
am 21d8d89c: am 06279285: Merge "Revert "Move some tests to libc++.""
...
* commit '21d8d89c7cda35ad1571375cf051c0b050604619':
Revert "Move some tests to libc++."
2014-11-12 16:37:16 +00:00
Dan Albert
ff0079fc8f
am 4e472966: am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."
...
* commit '4e4729668617ff1b45f88b15d8cbfecc3c0a1db2':
Move liblog tests and benchmarks to libc++.
2014-11-12 16:36:52 +00:00
Dan Albert
21d8d89c7c
am 06279285: Merge "Revert "Move some tests to libc++.""
...
* commit '06279285ae38b58988a9431c89b8689d8e16904e':
Revert "Move some tests to libc++."
2014-11-12 05:50:56 +00:00
Dan Albert
06279285ae
Merge "Revert "Move some tests to libc++.""
2014-11-12 05:43:55 +00:00
Dan Albert
1d3b492bde
Revert "Move some tests to libc++."
...
The build system is still linking both libgcc and libcompiler-rt,
which is causing duplicate symbol errors on some architectures. This
requires a fix in the build system, so reverting for now.
This reverts commit e3cccbfd47
2014-11-11 21:42:27 -08:00
Dan Albert
4e47296686
am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."
...
* commit '5c7e2e603079c611b99302e5898b443440f2d9d7':
Move liblog tests and benchmarks to libc++.
2014-11-12 03:54:34 +00:00
Dan Albert
5c7e2e6030
Merge "Move liblog tests and benchmarks to libc++."
2014-11-12 03:44:42 +00:00
Dan Albert
f2dedb7a5f
Move liblog tests and benchmarks to libc++.
...
Bug: 15193147
Change-Id: Ib063eb9490e40f9d10c0b0f29b7808c729e4fff9
2014-11-12 03:44:16 +00:00
Dan Albert
e924cced8e
am 498c8135: am 7d196df6: Merge "Move some tests to libc++."
...
* commit '498c8135b46b976806fb4e335071c11fc2c51776':
Move some tests to libc++.
2014-11-12 03:43:52 +00:00
Dan Albert
498c8135b4
am 7d196df6: Merge "Move some tests to libc++."
...
* commit '7d196df6f9990b5c93e0661fb0867971da7e6c34':
Move some tests to libc++.
2014-11-12 02:52:59 +00:00
JP Abgrall
c3939f08da
fs_mgr: let fsck.f2fs actually attempt a fix automerge: eb6036a
...
automerge: e90304c
2014-11-12 01:59:11 +00:00
Dan Albert
7d196df6f9
Merge "Move some tests to libc++."
2014-11-12 01:53:28 +00:00
JP Abgrall
e90304c8f1
fs_mgr: let fsck.f2fs actually attempt a fix
...
automerge: eb6036a
2014-11-12 00:19:54 +00:00
Dan Albert
e3cccbfd47
Move some tests to libc++.
...
Bug: 15193147
Change-Id: I93244e4a5d0c751056910ec8005a92401d305716
2014-11-11 23:59:02 +00:00
Dan Albert
0d7164d4dd
Remove the stlport linked libbacktrace.
...
Rename the libc++ linked libbacktrace to the normal name.
Bug: 15193147
Change-Id: I75caf1ee527e3703825e0db757497fb8fa3dd122
2014-11-11 15:57:38 -08:00
Daniel Rosenberg
9eb0ef6f40
am 82831c3d: am 4b862563: Merge "property_service: Added vendor build properties to load_all_props"
...
* commit '82831c3d26e5b38bd24bbd241dac40e09fd9ba4b':
property_service: Added vendor build properties to load_all_props
2014-11-11 22:52:07 +00:00
Daniel Rosenberg
82831c3d26
am 4b862563: Merge "property_service: Added vendor build properties to load_all_props"
...
* commit '4b862563be2627864590be7dd071c1d0289a6f33':
property_service: Added vendor build properties to load_all_props
2014-11-11 22:47:04 +00:00
Daniel Rosenberg
4b862563be
Merge "property_service: Added vendor build properties to load_all_props"
2014-11-11 20:39:58 +00:00
Daniel Rosenberg
b95122205d
property_service: Added vendor build properties to load_all_props
...
Change-Id: I267bd848e1f6e2978024c07e603b25f1f41f5fbf
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-11-11 12:17:00 -08:00
Yabin Cui
d94793afb1
am 556f4382: am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"
...
* commit '556f43820f90e78bbe8fc6f7dea6be865e975ab8':
kill HAVE_POSIX_FILEMAP
2014-11-11 19:57:14 +00:00
Yabin Cui
556f43820f
am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"
...
* commit '2c0839e9dba6d9d282f8391c3edb14236f56618d':
kill HAVE_POSIX_FILEMAP
2014-11-11 19:53:38 +00:00
Yabin Cui
2c0839e9db
Merge "kill HAVE_POSIX_FILEMAP"
2014-11-11 19:24:20 +00:00
Yabin Cui
266092c52d
kill HAVE_POSIX_FILEMAP
...
Bug: 18315579
Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
2014-11-11 10:31:30 -08:00
Elliott Hughes
35c265a35a
am 62abd4c8: am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."
...
* commit '62abd4c851c89ddc437af909791761cc3219ff00':
Fix formatting in 4df4dfedf6
2014-11-11 00:04:55 +00:00
Elliott Hughes
4dc88ea387
am 496fc30d: am af2cd21d: Merge "When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno."
...
* commit '496fc30d9988ff8de8eefc575cb8c8335ec8cf8e':
When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno.
2014-11-10 23:59:53 +00:00
Elliott Hughes
62abd4c851
am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."
...
* commit 'b0d30271699ecd48be791bbd002d2366b831a624':
Fix formatting in 4df4dfedf6
2014-11-10 23:59:10 +00:00
Elliott Hughes
496fc30d99
am af2cd21d: Merge "When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno."
...
* commit 'af2cd21d00f16f4915a40004bdbdc2603e958f5a':
When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno.
2014-11-10 23:54:18 +00:00
Elliott Hughes
b0d3027169
Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."
2014-11-10 23:51:15 +00:00
Elliott Hughes
f6b62d0a7d
Fix formatting in 4df4dfedf6.
...
Change-Id: I1ad219285cb1f4a39cfe2bdef224b78eff843317
2014-11-10 15:50:30 -08:00
Elliott Hughes
af2cd21d00
Merge "When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno."
2014-11-10 23:45:50 +00:00
Bo Huang
4df4dfedf6
When new error happend,then errno should be updated accordingly.
...
Otherwise, need to keep previous errno.
Reproduced steps:
pre-condition:
DUT support external SDcard or Usb mass storage;
1. Insert blank(no partition) SDcard or UMS to DUT;
Expected result:
Should prompt user with storage error.
Test result:
There is no notification for error.
Error log:
01-01 01:06:49.239 I/fsck_msdos( 200): fsck_msdos terminated by exit(8)
01-01 01:06:49.239 E/Vold ( 200): /dev/block/vold/179:16 failed FS checks (I/O error)
01-01 01:06:49.239 D/Vold ( 200): Volume sdcard1 state changing 3 (Checking) -> 1 (Idle-Unmounted)
01-01 01:06:49.239 W/Vold ( 200): Returning OperationFailed - no handler for errno 0)
Root cause analysis:
1.Volume::setState will call senBroadcase to send out state notification;
2.Finally, SocketClient::sendDataLockedv was called to sent message.
In sendDataLockedv funtion, when current == iovcnt, e is 0 by default.
So Vold get incorrect errno.
Change-Id: Icb32a4193f02f22b5e3feaba177bc278f8f1f41b
Signed-off-by: Bo Huang <bo.b.huang@intel.com>
2014-11-10 15:45:16 -08:00
Elliott Hughes
70599eba5d
am 25fb460a: am ae52248f: Merge "init isn\'t built for platforms without dirent::d_type."
...
* commit '25fb460a03f25e3a68d4ecb5e3a35d366f772f62':
init isn't built for platforms without dirent::d_type.
2014-11-10 23:34:58 +00:00
Elliott Hughes
25fb460a03
am ae52248f: Merge "init isn\'t built for platforms without dirent::d_type."
...
* commit 'ae52248fa7ab12e1c3458aede101f143b1c76ead':
init isn't built for platforms without dirent::d_type.
2014-11-10 23:31:07 +00:00
Elliott Hughes
ae52248fa7
Merge "init isn't built for platforms without dirent::d_type."
2014-11-10 23:20:14 +00:00
Elliott Hughes
57583a789f
init isn't built for platforms without dirent::d_type.
...
Change-Id: Icd4b431576f2ba619ff4ae6fb871bb0210d3b2f2
2014-11-10 15:00:00 -08:00
Elliott Hughes
fb27aafd4f
am b777eacc: am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."
...
* commit 'b777eacc871e246782ea61f51d87f75f9dc2bc15':
bionic's struct stat is now POSIX-compliant.
2014-11-10 22:18:17 +00:00
Elliott Hughes
b777eacc87
am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."
...
* commit '1da681ca4d3d2b5973d364e80f7a5db47d1240c1':
bionic's struct stat is now POSIX-compliant.
2014-11-10 22:14:42 +00:00
Elliott Hughes
1da681ca4d
Merge "bionic's struct stat is now POSIX-compliant."
2014-11-10 19:07:15 +00:00
Elliott Hughes
f1df854e58
bionic's struct stat is now POSIX-compliant.
...
Right now we still have the kernel names, but they're only there by
"virtue" of macro namespace pollution, so I'd like to get rid of them.
Bug: 18298106
Change-Id: Ifed0b3a9238c79a99d8a2b62e0f5897c50a725d1
2014-11-10 11:03:38 -08:00
Nick Kralevich
951d0d0257
am d6520cf9: am 65a83bdf: Merge "Reserve some AIDs for OEMs"
...
* commit 'd6520cf95869eb7d694f9d79abc47de1e2052d52':
Reserve some AIDs for OEMs
2014-11-10 17:54:09 +00:00
Nick Kralevich
d6520cf958
am 65a83bdf: Merge "Reserve some AIDs for OEMs"
...
* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
Reserve some AIDs for OEMs
2014-11-10 17:51:34 +00:00
Nick Kralevich
65a83bdf2e
Merge "Reserve some AIDs for OEMs"
2014-11-10 17:42:58 +00:00
Johan Redestig
60ac6364ec
Reserve some AIDs for OEMs
...
OEMs frequently add some AIDs on their own. Reserve some range
for them to use.
Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
2014-11-10 08:14:21 +01:00
Stephen Hines
e27b4109ab
am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
...
automerge: 96031a9
2014-11-09 09:11:58 +00:00
Dan Albert
9f9d9e668c
am aaa920d7: Merge "Make Unicode.h use types that match libc++."
...
automerge: 7c7a782
2014-11-09 09:11:52 +00:00
Stephen Hines
96031a9985
am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
...
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
Move winsock2.h in front of a potential windows.h include.
2014-11-09 09:03:31 +00:00
Dan Albert
7c7a782cad
am aaa920d7: Merge "Make Unicode.h use types that match libc++."
...
* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
Make Unicode.h use types that match libc++.
2014-11-09 09:03:30 +00:00
