commit 0115f04b3546e62056d7f0340d0c8c4dd7e34cd7
author yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jul 27 20:36:53 2012
committer yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jul 27 20:36:53 2012
tree d1797650c63a4dcaaa3d50a28b57884aa9c25121
parent 35f7e5399e616c4076a10d9f06d2e97e9880558f

Relanding 148377 - [Android] Upstream additional changes from envsetup.

Now requires you to specifically change the GYP_GENERATORS to specify Ninja. The original change broke because gyp ran for both make and ninja and the webkit bot determines whether to use ninja by the presence of build.ninja (thanks to Peter for figuring this out)

BUG=137569,136693


Review URL: https://chromiumcodereview.appspot.com/10827073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148790 0039d316-1c4b-4281-b951-d872f2087c98