Improve development workflow with built libchromiumcontent

- Add `--debug_libchromiumcontent` to build libchromiumcontent for debugging
  (shared library build).
- By default, only invoke `gclient sync` the first time to checkout chromium
  source tree. Add `--force_update_libchromiumcontent` switch to force updating.
- Document new options.

The goal is to allow faster edit/compile cycles when debugging/making changes
to libchromiumcontent.

script/bootstrap.py

@@ -38,8 +38,9 @@ def main():
   libcc_static_library_path = args.libcc_static_library_path
 
   # Redirect to use local libchromiumcontent build.
-  if args.build_libchromiumcontent:
-    build_libchromiumcontent(args.verbose, args.target_arch, defines)
+  if args.build_release_libcc or args.build_debug_libcc:
+    build_libchromiumcontent(args.verbose, args.target_arch, defines,
+                             args.build_debug_libcc, args.update_libcc)
     dist_dir = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'dist', 'main')
     libcc_source_path = os.path.join(dist_dir, 'src')
     libcc_shared_library_path = os.path.join(dist_dir, 'shared_library')
@@ -88,8 +89,14 @@ def parse_args():
   parser.add_argument('--clang_dir', default='', help='Path to clang binaries')
   parser.add_argument('--disable_clang', action='store_true',
                       help='Use compilers other than clang for building')
-  parser.add_argument('--build_libchromiumcontent', action='store_true',
-                      help='Build local version of libchromiumcontent')
+  build_libcc = parser.add_mutually_exclusive_group()
+  build_libcc.add_argument('--build_release_libcc', action='store_true',
+                           help='Build release version of libchromiumcontent')
+  build_libcc.add_argument('--build_debug_libcc', action='store_true',
+                           help='Build debug version of libchromiumcontent')
+  parser.add_argument('--update_libcc', default=False,
+                      action='store_true', help=('force gclient invocation to '
+                      'update libchromiumcontent'))
   parser.add_argument('--libcc_source_path', required=False,
                       help='The source path of libchromiumcontent. ' \
                            'NOTE: All options of libchromiumcontent are ' \
@@ -162,9 +169,14 @@ def update_win32_python():
       execute_stdout(['git', 'clone', PYTHON_26_URL])
 
 
-def build_libchromiumcontent(verbose, target_arch, defines):
+def build_libchromiumcontent(verbose, target_arch, defines, debug,
+                             force_update):
   args = [sys.executable,
           os.path.join(SOURCE_ROOT, 'script', 'build-libchromiumcontent.py')]
+  if debug:
+    args += ['-d']
+  if force_update:
+    args += ['--force-update']
   if verbose:
     args += ['-v']
   if defines:

script/build-libchromiumcontent.py

@@ -6,13 +6,29 @@ import sys
 
 from lib.config import enable_verbose_mode, get_target_arch
 from lib.util import execute_stdout
+from bootstrap import get_libchromiumcontent_commit 
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+LIBCC_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'libchromiumcontent')
+GCLIENT_DONE_MARKER = os.path.join(SOURCE_ROOT, '.gclient_done')
+LIBCC_COMMIT = get_libchromiumcontent_commit()
+
+
+def update_gclient_done_marker():
+  with open(GCLIENT_DONE_MARKER, 'wb') as f:
+    f.write(LIBCC_COMMIT)
+
+
+def libchromiumcontent_outdated():
+  if not os.path.exists(GCLIENT_DONE_MARKER):
+    return True
+  with open(GCLIENT_DONE_MARKER, 'rb') as f:
+    return f.read() != LIBCC_COMMIT
 
 
 def main():
-  os.chdir(SOURCE_ROOT)
+  os.chdir(LIBCC_DIR)
 
   args = parse_args()
   if args.verbose:
@@ -22,18 +38,25 @@ def main():
   # ./script/update -t x64 --defines=''
   # ./script/build --no_shared_library -t x64
   # ./script/create-dist -c static_library -t x64 --no_zip
-  script_dir = os.path.join(SOURCE_ROOT, 'vendor', 'libchromiumcontent',
-                            'script')
+  script_dir = os.path.join(LIBCC_DIR, 'script')
   bootstrap = os.path.join(script_dir, 'bootstrap')
   update = os.path.join(script_dir, 'update')
   build = os.path.join(script_dir, 'build')
   create_dist = os.path.join(script_dir, 'create-dist')
-  execute_stdout([sys.executable, bootstrap])
-  execute_stdout([sys.executable, update, '-t', args.target_arch,
-                  '--defines', args.defines])
-  execute_stdout([sys.executable, build, '-R', '-t', args.target_arch])
-  execute_stdout([sys.executable, create_dist, '-c', 'static_library',
-                  '--no_zip', '-t', args.target_arch])
+  if args.force_update or libchromiumcontent_outdated():
+    execute_stdout([sys.executable, bootstrap])
+    execute_stdout([sys.executable, update, '-t', args.target_arch,
+                    '--defines', args.defines])
+    update_gclient_done_marker()
+  if args.debug:
+    execute_stdout([sys.executable, build, '-D', '-t', args.target_arch])
+    execute_stdout([sys.executable, create_dist, '-c', 'shared_library',
+                    '--no_zip', '--keep-debug-symbols',
+                    '-t', args.target_arch])
+  else:
+    execute_stdout([sys.executable, build, '-R', '-t', args.target_arch])
+    execute_stdout([sys.executable, create_dist, '-c', 'static_library',
+                    '--no_zip', '-t', args.target_arch])
 
 
 def parse_args():
@@ -44,6 +67,10 @@ def parse_args():
                       help='The definetions passed to gyp')
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Prints the output of the subprocesses')
+  parser.add_argument('-d', '--debug', action='store_true',
+                      help='Build libchromiumcontent for debugging')
+  parser.add_argument('--force-update', default=False, action='store_true',
+                      help='Force gclient to update libchromiumcontent')
   return parser.parse_args()
 
 

script/build.py

@@ -11,6 +11,9 @@ from lib.util import electron_gyp, import_vs_env
 
 CONFIGURATIONS = ['Release', 'Debug']
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+LIBCC_SOURCE_ROOT = os.path.join(SOURCE_ROOT, 'vendor', 'libchromiumcontent')
+LIBCC_DIST_MAIN = os.path.join(LIBCC_SOURCE_ROOT, 'dist', 'main')
+GCLIENT_DONE = os.path.join(SOURCE_ROOT, '.gclient_done')
 
 
 def main():
@@ -24,6 +27,19 @@ def main():
     ninja += '.exe'
 
   args = parse_args()
+  if args.libcc:
+    if ('D' not in args.configuration
+        or not os.path.exists(GCLIENT_DONE)
+        or not os.path.exists(os.path.join(LIBCC_DIST_MAIN, 'build.ninja'))):
+      sys.stderr.write('--libcc should only be used when '
+                       'libchromiumcontent was built with bootstrap.py -d '
+                       '--debug_libchromiumcontent' + os.linesep)
+      sys.exit(1)
+    script = os.path.join(LIBCC_SOURCE_ROOT, 'script', 'build')
+    subprocess.check_call([sys.executable, script, '-D', '-t',
+                           get_target_arch()])
+    subprocess.check_call([ninja, '-C', LIBCC_DIST_MAIN])
+
   for config in args.configuration:
     build_path = os.path.join('out', config[0])
     ret = subprocess.call([ninja, '-C', build_path, args.target])
@@ -42,6 +58,13 @@ def parse_args():
                       help='Build specified target',
                       default=electron_gyp()['project_name%'],
                       required=False)
+  parser.add_argument('--libcc',
+                      help=(
+                        'Build libchromiumcontent first. Should be used only '
+                        'when libchromiumcontent as built with boostrap.py '
+                        '-d --debug_libchromiumcontent.'
+                      ),
+                      action='store_true', default=False)
   return parser.parse_args()