Fix compatibility with Android NDK r10d.

Fix compatibility with Android NDK r10d.

This is a reland of the previous CL (r1433). r1433 did not achieve what
intended and failed the x86_64 build of Chrome with NDK r10c.
The workaround logic in this CL is identical to r1433, but the #define
magic is applied in a more appropriate proper place this time. Turns
out Breakpad already has an Android compatibility layer, which is
common/android/include. Piggybacking the fix there.

BUG=breakpad:642
R=fdegans@chromium.org, rmcilroy@chromium.org

Committed: https://code.google.com/p/google-breakpad/source/detail?r=1434

[primiano]

Apologies for the double round.
This should be the right way to fix this.
I checked locally with a full x64 build, and this time it actually works :-)

[fdegans]

Just a few nits. Other than that, lgtm.

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
File src/common/android/include/sys/user.h (right):

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
src/common/android/include/sys/user.h:40: // - Other platforms: Just use the
Android NDK unchanged.
Nit: Move this line under the x86_64 comment.

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
src/common/android/include/sys/user.h:147: #endif  // __mips__
Could you change the #else on line 117 with this #endif?
It won't change anything but it would look cleaner.

[rmcilroy]

lgtm.

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
File src/common/android/include/sys/user.h (right):

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
src/common/android/include/sys/user.h:147: #endif  // __mips__
On 2015/03/16 12:54:39, fdegans wrote:
> Could you change the #else on line 117 with this #endif?
> It won't change anything but it would look cleaner.

This would mean that #include_next <sys/user.h> would happen on mips platforms
though, which hadn't happened previously

[fdegans]

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
File src/common/android/include/sys/user.h (right):

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
src/common/android/include/sys/user.h:147: #endif  // __mips__
On 2015/03/16 13:31:26, rmcilroy wrote:
> On 2015/03/16 12:54:39, fdegans wrote:
> > Could you change the #else on line 117 with this #endif?
> > It won't change anything but it would look cleaner.
> 
> This would mean that #include_next <sys/user.h> would happen on mips platforms
> though, which hadn't happened previously

Ha yes you are right, ignore my comment.

[primiano]

Thanks

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
File src/common/android/include/sys/user.h (right):

https://breakpad.appspot.com/3794002/diff/1/src/common/android/include/sys/us...
src/common/android/include/sys/user.h:40: // - Other platforms: Just use the
Android NDK unchanged.
On 2015/03/16 12:54:39, fdegans wrote:
> Nit: Move this line under the x86_64 comment.

Done.

[primiano]

Committed patchset #2 (id:60001) manually as 1434 (presubmit successful).