Disable OpenCL support by default

gni/angle.gni

@@ -16,6 +16,9 @@ declare_args() {
   # Defaults to capture building to $root_out_dir/angle_libs/with_capture.
   # Switch on to build capture to $root_out_dir.
   angle_with_capture_by_default = false
+
+  # Enables OpenCL support, off by default.
+  angle_enable_cl = false
 }
 
 if (angle_has_build) {
@@ -189,11 +192,6 @@ declare_args() {
   angle_has_histograms = angle_has_build
 }
 
-declare_args() {
-  # Build OpenCL support by default.
-  angle_enable_cl = true
-}
-
 if (!defined(angle_zlib_compression_utils_dir)) {
   angle_zlib_compression_utils_dir = "//third_party/zlib/google"
 }

infra/specs/angle_mb_config.pyl

@@ -66,7 +66,7 @@
       'gn_args': 'target_os="android"',
     },
     'angle': {
-      'gn_args': 'build_angle_gles1_conform_tests=true build_angle_trace_perf_tests=true is_component_build=false',
+      'gn_args': 'build_angle_gles1_conform_tests=true build_angle_trace_perf_tests=true is_component_build=false angle_enable_cl=true',
     },
     'arm': {
       'gn_args': 'target_cpu="arm"',