summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 01:28:46 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 01:28:46 +0000
commita0a4460f7e2756ad18b6fc7e7e3e8e7f101dce91 (patch)
treed88ed51149885f039c9c0727ffe3e7ff06449e46
parent64d596f9e7ae30079687f2cdda61bfd45fdbd0c5 (diff)
downloadchromium_src-a0a4460f7e2756ad18b6fc7e7e3e8e7f101dce91.zip
chromium_src-a0a4460f7e2756ad18b6fc7e7e3e8e7f101dce91.tar.gz
chromium_src-a0a4460f7e2756ad18b6fc7e7e3e8e7f101dce91.tar.bz2
Disable GN in gyp_chromium.
Android is still broken: https://chromegw.corp.google.com/i/clank.tot/builders/clang-clankium-tot-builder/builds/23775/steps/runhooks/logs/stdio ERROR at the command-line "--gyp_vars":1:29: Invalid token. data_reduction_fallback_host%="http://compress.googlezip.net:80/" app_manifest_version_name="clang-clankium-tot-builder 33.0.1728.0" gcc_version="46" app_manifest_version_code="1728000" data_reduction_proxy_probe_url%="http://check.googlezip.net/connect" host_os="linux" component="shared_library" clang="1" spdy_proxy_auth_origin%="https://proxy.googlezip.net:443/" order_text_section="/b/build/slave/clang-clankium-tot-builder/build/src/orderfiles/orderfile.out" spdy_proxy_auth_value%="3c1d997267c567617ffe0e1b1ebbeed71398dd27" target_arch="arm" chrome_build_id="none" fastbuild="1" OS="android" android_app_targets="['../clank/native/framework/clank.gyp:clank', '../clank/native/framework/clank.gyp:devtools_resources', '../clank/native/framework/clank.gyp:chrome_test_apk', '../clank/java/geppetto/uiautomator.gyp:chrome_uiautomator_tests']"  ^ I have no idea what this is. Generating gyp files from GN... < gclient runhooks ERROR: process exited with code 2 @@@STEP_FAILURE@@@ FATAL 2 != 88 BUG= NOTRY=true Review URL: https://codereview.chromium.org/99963007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238519 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/gyp_chromium6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 2d13d15..afa7fdf 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -205,8 +205,10 @@ if __name__ == '__main__':
supplemental_includes = GetSupplementalFiles()
- if not RunGN(supplemental_includes):
- sys.exit(1)
+ # Temporarily disabled until it is debugged.
+ # TODO(brettw) re-enable this code.
+ #if not RunGN(supplemental_includes):
+ # sys.exit(1)
args.extend(
['-I' + i for i in additional_include_files(supplemental_includes, args)])