Re-enable DepsCache using GOMA_DEPS_CACHE_FILE

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 145 matching lines @@
 
   # Caches CRLs in GOMA_CACHE_DIR.
   # Since downloading CRLs is usually slow, caching them may improves
   # compiler_proxy start time.
   if not os.path.exists(options.goma_cache_dir):
     os.mkdir(options.goma_cache_dir, 0700)
   env['GOMA_CACHE_DIR'] = options.goma_cache_dir
 
   # Enable DepsCache. DepsCache caches the list of files to send goma server.
   # This will greatly improve build speed when cache is warmed.
-  # The cache file is stored in the target output directory.
-  env['GOMA_DEPS_CACHE_DIR'] = (
+  if options.goma_deps_cache_file:
+    env['GOMA_DEPS_CACHE_FILE'] = options.goma_deps_cache_file
+  else:
+    # TODO(shinyak): GOMA_DEPS_CACHE_DIR will be removed from goma in future.
+    # GOMA_DEPS_CACHE_FILE should be used.
+    env['GOMA_DEPS_CACHE_DIR'] = (
       options.goma_deps_cache_dir or options.target_output_dir)
 
   if options.goma_hermetic:
     env['GOMA_HERMETIC'] = options.goma_hermetic
   if options.goma_enable_remote_link:
     env['GOMA_ENABLE_REMOTE_LINK'] = options.goma_enable_remote_link
   if options.goma_store_local_run_output:
     env['GOMA_STORE_LOCAL_RUN_OUTPUT'] = options.goma_store_local_run_output
 
   if options.build_data_dir:
@@ skipping 312 matching lines @@
                              help='If building for the ChromeOS Simple Chrome '
                                   'workflow, the name of the ChromeOS board.')
   option_parser.add_option('--out-dir', action='store',
                            help='Specify a custom output directory.')
   option_parser.add_option('--goma-dir',
                            default=os.path.join(BUILD_DIR, 'goma'),
                            help='specify goma directory')
   option_parser.add_option('--goma-cache-dir',
                            default=DEFAULT_GOMA_CACHE_DIR,
                            help='specify goma cache directory')
+  option_parser.add_option('--goma-deps-cache-file',
+                           help='specify goma deps cache file')
   option_parser.add_option('--goma-deps-cache-dir',
-                           help='specify goma deps cache directory')
+                           help='specify goma deps cache directory. '
+                                 'DEPRECATED. Use --goma-deps-cache-file')

[tikuta, 2016/10/03 08:25:00]

indent?

[shinyak, 2016/10/03 08:34:08]

Done.

   option_parser.add_option('--goma-hermetic', default='error',
                            help='Set goma hermetic mode')
   option_parser.add_option('--goma-enable-remote-link', default=None,
                            help='Enable goma remote link.')
   option_parser.add_option('--goma-store-local-run-output', default=None,
                            help='Store local run output to goma servers.')
   option_parser.add_option('--goma-fail-fast', action='store_true')
   option_parser.add_option('--goma-disable-local-fallback', action='store_true')
   option_parser.add_option('--goma-jsonstatus',
                            help='Specify a file to dump goma_ctl jsonstatus.')
@@ skipping 54 matching lines @@
   exit_status = main_ninja(options, args, env)
 
   # stop goma
   goma_teardown(options, env, exit_status, goma_cloudtail)
 
   return exit_status
 
 
 if '__main__' == __name__:
   sys.exit(real_main())