Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this …

Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this is the only change that touched GYP files.

apk-based test runner work.  Not enabled yet.  This CL is a combination of upstreaming, ndk/ant-ification, and other tweaks.


BUG=None
TEST=


Review URL: http://codereview.chromium.org/9834037

TBR=jrg@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128685

[Ryan Sleevi, 2012-03-24 04:52:28]

This was indeed responsible for the xcode break. After reverting, mac waterfall
bots greened up.

[Ryan Sleevi, 2012-03-24 05:05:35]

Sample log from a mac bot:

________ running '/usr/bin/python src/build/gyp_chromium' in
'/b/build/slave/cr-mac-rel/build'
Updating projects from gyp files...
Using overrides found in /Users/chrome-bot/.gyp/include.gypi
Traceback (most recent call last):
  File "src/build/gyp_chromium", line 171, in <module>
    sys.exit(gyp.main(args))
  File "/b/build/slave/cr-mac-rel/build/src/tools/gyp/pylib/gyp/__init__.py",
line 480, in main
    generator.GenerateOutput(flat_list, targets, data, params)
  File
"/b/build/slave/cr-mac-rel/build/src/tools/gyp/pylib/gyp/generator/xcode.py",
line 620, in GenerateOutput
    for included_file in build_file_dict['included_files']:
KeyError: 'included_files'
Error: Command /usr/bin/python src/build/gyp_chromium returned non-zero exit
status 1 in /b/build/slave/cr-mac-rel/build
elapsedTime=149.944095
program finished with exit code 2

Nico mentions that mac_no_goma should be an xcodebuild trybot. Two possibilities
for root causes: .gyp should be .gypi, as it's included. The other would be to
make sure the GYP isn't completely empty for non-android: For example, use a
'targets' block unconditionally but then make the individual target conditional.
The latter seems unlikely.

[Ryan Sleevi, 2012-03-24 05:34:57]

also: check_deps failures on Windows

http://build.chromium.org/p/chromium/builders/Win7%20Tests%20%28dbg%29%281%29...

Using base directory: e:\b\build\slave\Win7_Tests__dbg__1_\build\src
Checking: e:\b\build\slave\Win7_Tests__dbg__1_\build\src
ERROR in
e:/b/build/slave/Win7_Tests__dbg__1_/build/src\base\test\android\native_test_launcher.cc
Illegal include: "gtest/gtest.h"
    Because of no rule applying