tree 8ecdbfbfb136177244e453e0522c2bf9160c41ab
parent 26a7d054f77bc43c16377f9da6f33609f3ced5ab
author torne <torne@chromium.org> 1409913187 -0700
committer Ben Murdoch <benm@google.com> 1411499954 +0000

Cherrypick "Don't include TargetConditionals.h when building for android."

> Move the include of the Mac TargetConditionals.h file to after we've
> checked if we're building for Android. Apparently this file doesn't
> exist on all macs used to build android and the rest of android builds
> fine without it, so including it there causes the build to fail. It
> appears to only be used to test TARGET_OS_IPHONE which will never be
> true on android.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/538563002
>
> Cr-Commit-Position: refs/heads/master@{#293495}

Bug: 17401514
(cherry picked from commit 8001123e38cc0174b9ab616e684f7b788da87f2c)

Change-Id: I159d749f96b9564c4173c04d6ee572d2d23d1c90