Use CHROME_HEADLESS to check if download_sdk_extras.py is running on a bot.

build/download_sdk_extras.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Script to download sdk/extras packages on the bots from google storage.
 
 The script expects arguments that specify zips file in the google storage
 bucket named: <dir in SDK extras>_<package name>_<version>.zip. The file will
 be extracted in the android_tools/sdk/extras directory.

[hinoka, 2015/02/17 21:29:08]

Add something about how this isn't for public consumption?

[navabi, 2015/02/17 21:44:05]

Done.

 """
 
 import json
 import os
 import shutil
 import subprocess
 import sys
 import zipfile
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'android'))
+script_dir = os.path.dirname(os.path.realpath(__file__))

[kjellander_chromium, 2015/02/17 21:32:59]

These variables are usually uppercase (constants), so let's make them uppercase
as the ones below are that too, for consistency.

[navabi, 2015/02/17 21:44:05]

Done.

+chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
+sys.path.insert(0, os.path.join(script_dir, 'android'))
 from pylib import constants

[nyquist, 2015/02/17 21:37:05]

Nit: Could this be moved one line down? I find it easier to read to find all the
sys.path.inserts around the same place.

[navabi, 2015/02/17 21:44:05]

Done.

+sys.path.insert(1, os.path.join(chrome_src, 'tools'))
+import find_depot_tools
 
-GSUTIL_PATH = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
-    os.pardir, os.pardir, os.pardir, os.pardir, 'depot_tools', 'gsutil.py')
+DEPOT_PATH = find_depot_tools.add_depot_tools_to_path()
+GSUTIL_PATH = os.path.join(DEPOT_PATH, 'gsutil.py')
 SDK_EXTRAS_BUCKET = 'gs://chrome-sdk-extras'
 SDK_EXTRAS_PATH = os.path.join(constants.ANDROID_SDK_ROOT, 'extras')
 SDK_EXTRAS_JSON_FILE = os.path.join(os.path.dirname(__file__),
                                     'android_sdk_extras.json')
 
 
 def clean_and_extract(dir_name, package_name, zip_file):
   local_dir = '%s/%s/%s' % (SDK_EXTRAS_PATH, dir_name, package_name)
   if os.path.exists(local_dir):
     shutil.rmtree(local_dir)
   local_zip = '%s/%s' % (SDK_EXTRAS_PATH, zip_file)
   with zipfile.ZipFile(local_zip) as z:
     z.extractall(path=SDK_EXTRAS_PATH)
 
 
 def main():
-  if not os.path.exists(GSUTIL_PATH) or not os.path.exists(SDK_EXTRAS_PATH):
+  if not os.environ.get('CHROME_HEADLESS'):

[hinoka, 2015/02/17 20:34:01]

Or just check if GSUTIL_PATH exists?

we try to avoid using CHROME_HEADLESS unless its really necessary.

[navabi, 2015/02/17 20:38:24]

I did that before. But this does not work on WebRTC and some other bots because
their directory structure is not the same. See:
https://codereview.chromium.org/799673003/
for more details.

[hinoka, 2015/02/17 20:40:59]

Is switching to "find_depot_tools" sufficient?

[navabi, 2015/02/17 20:45:39]

No. Because it will find_depot_tools for developers. And then try to download
SDK extras. It will fail there because of authentication. I guess we could let
it get there, and if it doesn't have credentials it will fail anyway. But the
difference here is that it will only try to checkout on bots unless someone
explicitly sets CHROME_HEADLESS, in which case it will fail on authentication.

[hinoka, 2015/02/17 21:29:08]

Oh I see, auth issue.

     # This is not a buildbot checkout.
     return 0
   # Update the android_sdk_extras.json file to update downloaded packages.
   with open(SDK_EXTRAS_JSON_FILE) as json_file:
     packages = json.load(json_file)
   for package in packages:
     local_zip = '%s/%s' % (SDK_EXTRAS_PATH, package['zip'])
     if not os.path.exists(local_zip):
       package_zip = '%s/%s' % (SDK_EXTRAS_BUCKET, package['zip'])
       subprocess.check_call([GSUTIL_PATH, '--force-version', '4.7', 'cp',
                             package_zip, local_zip])
     # Always clean dir and extract zip to ensure correct contents.
     clean_and_extract(package['dir_name'], package['package'], package['zip'])
 
 
 if __name__ == '__main__':
   sys.exit(main())