| Index: tools/buildbot_spec.py | 
| diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py | 
| index 43a885632b77294a5aa84569a59d038fe481d611..0f7d2527af44a0d0ede26161934236a251f382f5 100755 | 
| --- a/tools/buildbot_spec.py | 
| +++ b/tools/buildbot_spec.py | 
| @@ -97,6 +97,9 @@ def gyp_defines(builder_dict): | 
| # ANGLE. | 
| if builder_dict.get('extra_config') == 'ANGLE': | 
| gyp_defs['skia_angle'] = '1' | 
| +    if builder_dict.get('os', '') in ('Ubuntu', 'Linux'): | 
| +      gyp_defs['use_x11'] = '1' | 
| +      gyp_defs['chromeos'] = '0' | 
|  | 
| # GDI. | 
| if builder_dict.get('extra_config') == 'GDI': | 
| @@ -303,6 +306,7 @@ def self_test(): | 
| 'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy', | 
| 'Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link', | 
| 'Build-Ubuntu-GCC-x86_64-Release-Mesa', | 
| +        'Build-Ubuntu-GCC-x86_64-Release-ANGLE', | 
| 'Housekeeper-PerCommit', | 
| 'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot', | 
| 'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify', | 
|  |