Dan Albert
589859a125
am 5b39a445: Merge "Fix mbsrtowcs(3) src param for finished string." into lmp-dev
...
* commit '5b39a44575e01ecf65397ffb7518efc3c65a6d8b':
Fix mbsrtowcs(3) src param for finished string.
2014-08-06 21:26:13 +00:00
Dan Albert
d14344adf2
am 40079b00: Fixes build.
...
* commit '40079b003168b39dab91e106c7a877b677e64ef1':
Fixes build.
2014-08-06 21:26:12 +00:00
Dan Albert
8b1af4762c
am 5386a741: Revert "Replaces vfork() implementation with fork()"
...
* commit '5386a741e77bfff4e72ca6861fdd3fe2208452ce':
Revert "Replaces vfork() implementation with fork()"
2014-08-06 21:26:09 +00:00
Elliott Hughes
fa70bacc6c
am 3a238ae7: Merge "Revert "Add a hack to <stdlib.h> until we can fix libvpx.""
...
* commit '3a238ae7620298608e1d463901051c397e4f8a2f':
Revert "Add a hack to <stdlib.h> until we can fix libvpx."
2014-08-06 20:38:40 +00:00
Elliott Hughes
5fb6ce2950
am 00a8344a: Merge "Workaround b/16818336 which fails build under aggressive inlining." into lmp-dev
...
* commit '00a8344ae82a691209b665adae828a5abe570cfb':
Workaround b/16818336 which fails build under aggressive inlining.
2014-08-06 19:50:02 +00:00
Paul Jensen
8019e6f0fd
am 7a5f0952: Merge "Revert most of "Cleanup: Delete dead code."" into lmp-dev
...
* commit '7a5f0952a293fd6e511db0e0a72e18f20bb4c500':
Revert most of "Cleanup: Delete dead code."
2014-08-06 19:50:01 +00:00
Dan Albert
40079b0031
Fixes build.
...
This change somehow went missing from the vfork change.
Change-Id: I807a2072080eac20601c694e85ba5723220289d8
(cherry picked from commit 9eae8405e8f70e489f2fe350a0212ab8114cbd17)
2014-08-06 12:32:28 -07:00
Dan Albert
5386a741e7
Revert "Replaces vfork() implementation with fork()"
...
We're getting cold feet on this one... let's put it back.
This reverts commit 210331d9762037afb9b5ed8413079c6f65872df9.
Change-Id: I6b0d3c2b1dbf7f1dc9566979a91b7504c2189269
(cherry picked from commit 6a918870bab1a55a5f57dd7954abd9a8a27c1bc2)
2014-08-06 12:32:22 -07:00
Elliott Hughes
a69fd4651a
am 42848344: am bb91a1b8: Merge "Workaround b/16818336 which fails build under aggressive inlining."
...
* commit '428483446e7cd52cb608481c091f2ac4521081ae':
Workaround b/16818336 which fails build under aggressive inlining.
2014-08-06 18:57:22 +00:00
Elliott Hughes
428483446e
am bb91a1b8: Merge "Workaround b/16818336 which fails build under aggressive inlining."
...
* commit 'bb91a1b845f7c8b3b09d07fe467aa32d2aeddc4f':
Workaround b/16818336 which fails build under aggressive inlining.
2014-08-06 18:53:23 +00:00
Elliott Hughes
5801991bdd
am 987e533e: am 59b0933e: Explain how wcswcs ended up in ndk_cruft.cpp.
...
* commit '987e533ed466a51a1b269f6707765d4a6243d27e':
Explain how wcswcs ended up in ndk_cruft.cpp.
2014-08-06 18:17:01 +00:00
Elliott Hughes
987e533ed4
am 59b0933e: Explain how wcswcs ended up in ndk_cruft.cpp.
...
* commit '59b0933e6d4cd9671ad3b6baeae424bc72c8ece0':
Explain how wcswcs ended up in ndk_cruft.cpp.
2014-08-06 18:09:18 +00:00
Elliott Hughes
f69f0b9ac2
am 10d197c6: am 8b91980e: Merge "Explain how wcswcs ended up in ndk_cruft.cpp."
...
* commit '10d197c681e96187645eaf6341d13967e33a0308':
Explain how wcswcs ended up in ndk_cruft.cpp.
2014-08-06 18:08:43 +00:00
Elliott Hughes
10d197c681
am 8b91980e: Merge "Explain how wcswcs ended up in ndk_cruft.cpp."
...
* commit '8b91980e4c139558f9cca4e9a0980dad07c06e68':
Explain how wcswcs ended up in ndk_cruft.cpp.
2014-08-06 18:02:59 +00:00
Elliott Hughes
59b0933e6d
Explain how wcswcs ended up in ndk_cruft.cpp.
...
(cherry picked from commit 1628eb1d43008c52b00ec98d10c4fd9e8b6fc7c5)
Change-Id: I335b35038781d0426b3647727e6c4f22c83e187b
2014-08-06 10:58:17 -07:00
Elliott Hughes
f77fbbb53e
am 0a693b4f: am afc86723: Merge "Add an obvious comment to <stdio.h> for fixincludes."
...
* commit '0a693b4fc88bc6e0f3b0672a994931cce5d42716':
Add an obvious comment to <stdio.h> for fixincludes.
2014-08-06 17:40:42 +00:00
Dmitriy Ivanov
694d295e5e
am 36730936: am db7a17d4: Revert "Revert "Fix dlsym(3) to do breadth first search.""
...
* commit '36730936a13b1948240641739a15c3ef56c501f3':
Revert "Revert "Fix dlsym(3) to do breadth first search.""
2014-08-06 17:36:10 +00:00
Dan Albert
282638f7f5
am 909464c2: am de69069f: Merge "Fixes build."
...
* commit '909464c2cb90fa8b530ae53fa849d3bc5818b676':
Fixes build.
2014-08-06 17:25:40 +00:00
Elliott Hughes
8b91980e4c
Merge "Explain how wcswcs ended up in ndk_cruft.cpp."
2014-08-06 17:20:04 +00:00
Elliott Hughes
1628eb1d43
Explain how wcswcs ended up in ndk_cruft.cpp.
...
Change-Id: Ie45148095b2d5c3896c0df623d5d06a700c33c70
2014-08-06 10:47:33 -07:00
Dan Albert
5b39a44575
Merge "Fix mbsrtowcs(3) src param for finished string." into lmp-dev
2014-08-06 17:19:40 +00:00
Dan Albert
938a8008a6
Fix mbsrtowcs(3) src param for finished string.
...
A mistake I made while cleaning this up the first time through.
mbstrtowcs(3) sets the src param to null if it finishes the string.
Change-Id: I6263646e25d9537043b7025fd1dd6ae195f365e2
(cherry picked from commit b6cc8e00cd562bd0f81fe44a6bc646540a862f32)
2014-08-06 13:00:54 -07:00
Elliott Hughes
3a238ae762
Merge "Revert "Add a hack to <stdlib.h> until we can fix libvpx.""
2014-08-06 17:15:22 +00:00
Elliott Hughes
9d2a05a6dd
Revert "Add a hack to <stdlib.h> until we can fix libvpx."
...
This reverts commit 3fb5097a7eec40404760c304b36c8b657b374cab.
libvpx is now fixed.
(cherry-pick of 2be1be47aa9b63568fe6ce1e0a4029b37d90764d.)
Bug: 15598056
Change-Id: Icca974e667f92206505f484bd291726eb0150f68
2014-08-06 13:20:41 -07:00
Dan Albert
bc0d65c114
Merge "Proper MB_CUR_MAX." into lmp-dev
2014-08-06 17:14:55 +00:00
Dan Albert
6035e6cc83
Proper MB_CUR_MAX.
...
Previously this was hard coded to 4. This is only the case for UTF-8
locales.
As a side effect, this properly reports C.UTF-8 as the default locale
instead of C.
Change-Id: I7c73cc8fe6ffac61d211cd5f75287e36de06f4fc
(cherry picked from commit 1aec7c1a35b2d03038b194967d5ebdc8e2c24b80)
2014-08-06 13:17:43 -07:00
Elliott Hughes
00a8344ae8
Merge "Workaround b/16818336 which fails build under aggressive inlining." into lmp-dev
2014-08-06 17:14:55 +00:00
Elliott Hughes
0a693b4fc8
am afc86723: Merge "Add an obvious comment to <stdio.h> for fixincludes."
...
* commit 'afc8672387438f9c8926a12831f43a6dd1f59323':
Add an obvious comment to <stdio.h> for fixincludes.
2014-08-06 16:13:37 +00:00
Ben Murdoch
62c69c25d2
fix the build
...
Change-Id: I8a3b26014ced1ce95b9a0f675099c3fdfbe041f3
2014-08-06 16:17:04 +01:00
Dan Albert
74508b2fec
am dfe8417a: am a7ef8188: Merge "Revert "Replaces vfork() implementation with fork()""
...
* commit 'dfe8417a58a8413cce6c7bb2b224950c7085245c':
Revert "Replaces vfork() implementation with fork()"
2014-08-06 12:10:50 +00:00
Dmitriy Ivanov
36730936a1
am db7a17d4: Revert "Revert "Fix dlsym(3) to do breadth first search.""
...
* commit 'db7a17d4ff56a05af01ee2fee1f3c55245bfc630':
Revert "Revert "Fix dlsym(3) to do breadth first search.""
2014-08-06 01:23:25 +00:00
Dehao Chen
7aa27e1c1a
Workaround b/16818336 which fails build under aggressive inlining.
...
Change-Id: Ifcd596714c427a2ec39502b9c0af9082ded91884
2014-08-05 18:09:01 -07:00
Dan Albert
909464c2cb
am de69069f: Merge "Fixes build."
...
* commit 'de69069fcfee8d89dfc70da374760ef0c29fe0a4':
Fixes build.
2014-08-05 21:55:18 +00:00
Dan Albert
dfe8417a58
am a7ef8188: Merge "Revert "Replaces vfork() implementation with fork()""
...
* commit 'a7ef8188e24446d41c5abbe9addf55cc6a128968':
Revert "Replaces vfork() implementation with fork()"
2014-08-05 21:43:20 +00:00
Elliott Hughes
afc8672387
Merge "Add an obvious comment to <stdio.h> for fixincludes."
2014-08-05 17:41:26 +00:00
Elliott Hughes
df85f50b82
Add an obvious comment to <stdio.h> for fixincludes.
...
We don't want GCC's fixincludes to touch our <stdio.h> because we
want to support multiple platform versions with one toolchain. Give
them a nice easy unambiguous string to look for.
Bug: http://code.google.com/p/android/issues/detail?id=73728
Change-Id: I15cb9a2c9eb0a44b0965dc2139f224f2b6e68ea1
2014-08-06 09:03:52 -07:00
Dan Albert
de69069fcf
Merge "Fixes build."
2014-08-05 17:41:26 +00:00
Dan Albert
9eae8405e8
Fixes build.
...
This change somehow went missing from the vfork change.
Change-Id: I807a2072080eac20601c694e85ba5723220289d8
2014-08-05 14:46:03 -07:00
Dan Albert
a7ef8188e2
Merge "Revert "Replaces vfork() implementation with fork()""
2014-08-05 17:41:26 +00:00
Dan Albert
6a918870ba
Revert "Replaces vfork() implementation with fork()"
...
We're getting cold feet on this one... let's put it back.
This reverts commit 210331d9762037afb9b5ed8413079c6f65872df9.
Change-Id: I6b0d3c2b1dbf7f1dc9566979a91b7504c2189269
2014-08-05 14:11:38 -07:00
Elliott Hughes
bb91a1b845
Merge "Workaround b/16818336 which fails build under aggressive inlining."
2014-08-05 00:30:25 +00:00
Dehao Chen
28285f85a1
Workaround b/16818336 which fails build under aggressive inlining.
...
(cherry-pick of 7aa27e1c1a53afe28f6180fd1fc50d096cabea7b.)
Change-Id: Ifcd596714c427a2ec39502b9c0af9082ded91884
2014-08-06 11:43:38 -07:00
Paul Jensen
7a5f0952a2
Merge "Revert most of "Cleanup: Delete dead code."" into lmp-dev
2014-08-05 00:19:02 +00:00
Paul Jensen
1544eae56e
Revert most of "Cleanup: Delete dead code."
...
This reverts most of commit 2582f02a01cd56c56a4e6c9de4444a6ec937cc37.
The DNS cache flushing code needs to be called when routes change.
Change-Id: I5b04121bc428cc6a2e136b6c3269c395bfb4981f
bug:16549455
2014-08-06 13:38:16 -04:00
Dmitriy Ivanov
db7a17d4ff
Revert "Revert "Fix dlsym(3) to do breadth first search.""
...
This reverts commit 1b1966d9448e979d1503a3d8843708bfa8880dc6.
Change-Id: I05d6d3481aaf8f3e260d2e5e950248519a1d347f
2014-08-04 23:39:22 +00:00
Dmitriy Ivanov
83a1c15907
am f9a0af9c: am 1b1966d9: Revert "Fix dlsym(3) to do breadth first search."
...
* commit 'f9a0af9c9343ba48ab42decbb8aab7fbefed1bd4':
Revert "Fix dlsym(3) to do breadth first search."
2014-08-04 16:50:33 +00:00
Dmitriy Ivanov
f9a0af9c93
am 1b1966d9: Revert "Fix dlsym(3) to do breadth first search."
...
* commit '1b1966d9448e979d1503a3d8843708bfa8880dc6':
Revert "Fix dlsym(3) to do breadth first search."
2014-08-04 16:46:55 +00:00
Dmitriy Ivanov
1b1966d944
Revert "Fix dlsym(3) to do breadth first search."
...
This reverts commit 422106a24d620af4be58e8d92a2e9b7b6167b72d.
Change-Id: I9e26a6933d10eb30438b521450f2010997ca5aee
2014-08-04 16:38:57 +00:00
Dan Albert
74a7a4d296
am b782c20b: am 447fe1c2: Merge "Fix mbsrtowcs(3) src param for finished string."
...
* commit 'b782c20b8244ec5cc348547291503a4c30ca65ba':
Fix mbsrtowcs(3) src param for finished string.
2014-07-31 22:35:45 +00:00
Dan Albert
b782c20b82
am 447fe1c2: Merge "Fix mbsrtowcs(3) src param for finished string."
...
* commit '447fe1c23bc5adaded9a51d3b58f3adaf2cce7b3':
Fix mbsrtowcs(3) src param for finished string.
2014-07-31 22:28:59 +00:00