Switch ChromeDriver builders from GYP to GN.

scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'depot_tools/bot_update',
   'chromium',
   'depot_tools/gclient',
   'recipe_engine/json',
   'recipe_engine/path',
@@ skipping 35 matching lines @@
   src_cfg.got_revision_mapping.update({'src': 'got_revision',
     'src/third_party/WebKit': 'got_webkit_revision',
     'src/tools/swarming_client': 'got_swarming_client_revision',
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
-  env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
-      'DEPOT_TOOLS_UPDATE': '0',
-      'GYP_DEFINES':
-      'branding=Chrome buildtype=Official component=static_library'}
+  env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
   api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
+  # meta build step
+  api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+      args=["gen", "-m", "chromium.chromedriver", "-b", "Linux32",

[jbudorick, 2016/07/22 02:58:31]

I guess this is ok in the short term, but it should be
build_properties.get('buildername') rather than "Linux32".

[samuong, 2016/07/22 03:52:22]

Done.

+          "//out/Default"])
   # chromedriver compile.py step
   api.python("compile", api.path["build"].join("scripts", "slave",
-    "compile.py"), args=['--target', 'Release',
-      'chromium_builder_chromedriver'])
+    "compile.py"), args=['--target', 'Default',
+      'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
+  # strip binary
+  api.m.step('strip', cmd=['strip', str(api.path['checkout'].join(
+      'out', 'Default', 'chromedriver'))])
   # annotated_steps step
   api.python("annotated_steps", api.path["build"].join("scripts", "slave",
     "chromium", "chromedriver_buildbot_run.py"),
     args=['--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":'+\
           '"chromedriver_buildbot_run.py","blink_config":"chromium",'+\
-          '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\
-          '"DEPOT_TOOLS_UPDATE"'':"0","GYP_DEFINES":"branding=Chrome '+\
-          'buildtype=Official component=static_library","LANDMINES_VERBOSE":'+\
+          '"gclient_env":{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":'+\
           '"1"},"needs_webdriver_java_tests":true,"use_xvfb_on_linux":true}'],
     allow_subannotations=True)
 
 
 def Mac_10_6_steps(api):
   # update scripts step; implicitly run by recipe engine.
   # bot_update step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "src"
@@ skipping 24 matching lines @@
   src_cfg.got_revision_mapping.update({'src': 'got_revision',
     'src/third_party/WebKit': 'got_webkit_revision',
     'src/tools/swarming_client': 'got_swarming_client_revision',
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
-  env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
-      'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES': ' component=static_library'}
+  env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
   api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
+  # meta build step
+  api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+      args=["gen", "-m", "chromium.chromedriver", "-b", "Mac 10.6",
+          "//out/Default"])
   # chromedriver compile.py step
   api.python("compile", api.path["build"].join("scripts", "slave",
-    "compile.py"), args=['--target', 'Release',
-      'chromium_builder_chromedriver'])
+    "compile.py"), args=['--target', 'Default',
+      'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
+  # strip binary
+  api.m.step('strip', cmd=['strip', str(api.path['checkout'].join(
+      'out', 'Default', 'chromedriver'))])
   # annotated_steps step
   api.python("annotated_steps", api.path["build"].join("scripts", "slave",
     "chromium", "chromedriver_buildbot_run.py"),
     args=['--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":"c'+\
           'hromedriver_buildbot_run.py","blink_config":"chromium","gclient_e'+\
-          'nv":{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP'+\
-          '_DEFINES":" component=static_library","LANDMINES_VERBOSE":"1"},"ne'+\
+          'nv":{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":"1"},"ne'+\
           'eds_webdriver_java_tests":true}'], allow_subannotations=True)
 
 
 def Win7_steps(api):
   # update scripts step; implicitly run by recipe engine.
   # taskkill step
   api.python("taskkill", api.path["build"].join("scripts", "slave",
     "kill_processes.py"))
   # bot_update step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
@@ skipping 26 matching lines @@
   src_cfg.got_revision_mapping.update({'src': 'got_revision',
     'src/third_party/WebKit': 'got_webkit_revision',
     'src/tools/swarming_client': 'got_swarming_client_revision',
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
-  env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
-      'DEPOT_TOOLS_UPDATE': '0','GYP_DEFINES': ' component=static_library'}
+  env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
   api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
+  # meta build step
+  api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+      args=["gen", "-m", "chromium.chromedriver", "-b", "Win7",
+          "//out/Default"])
   # chromedriver compile.py step
   api.step("compile", ["python_slave", api.path["build"].join("scripts",
-    "slave", "compile.py"), '--target', 'Release',
-    'chromium_builder_chromedriver'])
+    "slave", "compile.py"), '--target', 'Default',
+      'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
   # annotated_steps step
   api.step("annotated_steps", ["python_slave", api.path["build"].join("scripts",
     "slave", "chromium", "chromedriver_buildbot_run.py"),
     '--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
           'medriver_buildbot_run.py","blink_config":"chromium","gclient_env":'+\
-          '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEF'+\
-          'INES":" component=static_library","LANDMINES_VERBOSE":"1"},"needs_'+\
+          '{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":"1"},"needs_'+\
           'webdriver_java_tests":true}'], allow_subannotations=True)
 
 
 def Linux_steps(api):
   # update scripts step; implicitly run by recipe engine.
   # bot_update step
   src_cfg = api.gclient.make_config(GIT_MODE=True)
   soln = src_cfg.solutions.add()
   soln.name = "src"
   soln.url = "https://chromium.googlesource.com/chromium/src.git"
@@ skipping 23 matching lines @@
   src_cfg.got_revision_mapping.update({'src': 'got_revision',
     'src/third_party/WebKit': 'got_webkit_revision',
     'src/tools/swarming_client': 'got_swarming_client_revision',
     'src/v8': 'got_v8_revision'})
   api.gclient.c = src_cfg
   result = api.bot_update.ensure_checkout(force=True)
   build_properties = api.properties.legacy()
   build_properties.update(result.json.output.get('properties', {}))
   # gclient update step; made unnecessary by bot_update
   # gclient runhooks wrapper step
-  env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
-      'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES':
-      'branding=Chrome buildtype=Official component=static_library'}
+  env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
   api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
     "slave", "runhooks_wrapper.py"), env=env)
   # cleanup_temp step
   api.chromium.cleanup_temp()
+  # meta build step
+  api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+      args=["gen", "-m", "chromium.chromedriver", "-b", "Linux",
+          "//out/Default"])
   # chromedriver compile.py step
   api.python("compile", api.path["build"].join("scripts", "slave",
-    "compile.py"), args=['--target', 'Release',
-      'chromium_builder_chromedriver'])
+    "compile.py"), args=['--target', 'Default',
+      'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
+  # strip binary
+  api.m.step('strip', cmd=['strip', str(api.path['checkout'].join(
+      'out', 'Default', 'chromedriver'))])
   # annotated_steps step
   api.python("annotated_steps", api.path["build"].join("scripts", "slave",
     "chromium", "chromedriver_buildbot_run.py"),
     args=['--build-properties=%s' % api.json.dumps(build_properties,
       separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
           'medriver_buildbot_run.py","blink_config":"chromium","gclient_env":'+\
-          '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEF'+\
-          'INES":"branding=Chrome buildtype=Official component=static_library'+\
-          '","LANDMINES_VERBOSE":"1"},"needs_webdriver_java_tests":true,"use_'+\
-          'xvfb_on_linux":true}'], allow_subannotations=True)
+          '{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":"1"},"needs_webdrive'+\
+          'r_java_tests":true,"use_xvfb_on_linux":true}'],
+    allow_subannotations=True)
 
 
 dispatch_directory = {
   'Linux32': Linux32_steps,
   'Mac 10.6': Mac_10_6_steps,
   'Win7': Win7_steps,
   'Linux': Linux_steps,
 }
 
 
@@ skipping 22 matching lines @@
   yield (api.test('Linux') +
     api.properties(mastername='chromium.chromedriver') +
     api.properties(buildername='Linux') +
     api.properties(slavename='TestSlave')
         )
   yield (api.test('builder_not_in_dispatch_directory') +
     api.properties(mastername='chromium.chromedriver') +
     api.properties(buildername='nonexistent_builder') +
     api.properties(slavename='TestSlave')
         )