diff options
author | dbeam <dbeam@chromium.org> | 2015-03-25 11:25:49 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:26:40 +0000 |
commit | b59fe188aa76f3c18a71427c5e655aa609d7c7bd (patch) | |
tree | 91d58caa7f5d2dc92fa862a026fe2ac3e483aaa3 /remoting/remoting_options.gypi | |
parent | ae0c69314c5c0025e8e6144f3a7fe64384087c77 (diff) | |
download | chromium_src-b59fe188aa76f3c18a71427c5e655aa609d7c7bd.zip chromium_src-b59fe188aa76f3c18a71427c5e655aa609d7c7bd.tar.gz chromium_src-b59fe188aa76f3c18a71427c5e655aa609d7c7bd.tar.bz2 |
Rework how remoting JS compilation GYP works.
There was an unfortunate bug that swallowed Java stacks.
Issues were discovered when Java stacks started surfacing:
https://codereview.chromium.org/476453002/
So change the way remoting is built. It doesn't need to be
built on all bots by default: they have undefined Java versions
and likely weren't working before (and shouldn't differ).
Instead, run when run_jscompile=1 is defined in GYP:
export GYP_DEFINES=run_jscompile=1 && build/gyp_chromium
# or add in ~/.gyp/includes.gypi or $SRC/../chromium.gyp_env
# or build/gyp_chromium -Drun_jscompile=1
and on the Closure Compilation Linux FYI bot:
http://build.chromium.org/p/chromium.fyi/builders/Closure%20Compilation%20Linux
This also fixes some GYP inputs problems (if I changed compile_js.gypi or
other things in remoting/ ninja wouldn't rebuild anything).
R=jamiewalch@chromium.org
BUG=none
TEST=green bots, remoting runs on Closure Compliation Linux FYI bot
Review URL: https://codereview.chromium.org/1037613002
Cr-Commit-Position: refs/heads/master@{#322193}
Diffstat (limited to 'remoting/remoting_options.gypi')
-rw-r--r-- | remoting/remoting_options.gypi | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/remoting/remoting_options.gypi b/remoting/remoting_options.gypi index 56d339e..064a251 100644 --- a/remoting/remoting_options.gypi +++ b/remoting/remoting_options.gypi @@ -7,7 +7,7 @@ 'chromium_code': 1, # Set this to run the jscompile checks after building the webapp. - 'run_jscompile%': 1, + 'run_jscompile%': 0, # Set this to enable cast mode on the android client. 'enable_cast%': 0, @@ -27,14 +27,5 @@ 'remoting_rdp_session%': 1, 'branding_path': '../remoting/branding_<(branding)', - - 'conditions': [ - ['OS=="win"', { - # Java is not available on Windows bots, so we need to disable - # JScompile checks. - 'run_jscompile': 0, - }], - ], }, - } |