Add android_sdk asset

infra/bots/assets/asset_utils.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Utilities for managing assets."""
 
 
 import argparse
 import os
 import shlex
 import shutil
 import subprocess
 import sys
 
-SKIA_DIR = os.path.abspath(os.path.realpath(os.path.join(
-    os.path.dirname(os.path.abspath(__file__)),
-    os.pardir, os.pardir, os.pardir)))
-INFRA_BOTS_DIR = os.path.join(SKIA_DIR, 'infra', 'bots')
+INFRA_BOTS_DIR = os.path.abspath(os.path.realpath(os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), os.pardir)))
 sys.path.insert(0, INFRA_BOTS_DIR)
 import utils
 import zip_utils
 
 
 ASSETS_DIR = os.path.join(INFRA_BOTS_DIR, 'assets')
 DEFAULT_GS_BUCKET = 'skia-buildbots'
 GS_SUBDIR_TMPL = 'gs://%s/assets/%s'
 GS_PATH_TMPL = '%s/%s.zip'
+SKIA_DIR = os.path.abspath(os.path.join(INFRA_BOTS_DIR, os.pardir, os.pardir))
 VERSION_FILENAME = 'VERSION'
 ZIP_BLACKLIST = ['.git', '.svn', '*.pyc', '.DS_STORE']
 
 
 class _GSWrapper(object):
   """Wrapper object for interacting with Google Storage."""
   def __init__(self, gsutil):
     gsutil = os.path.abspath(gsutil) if gsutil else 'gsutil'
     self._gsutil = [gsutil]
     if gsutil.endswith('.py'):
@@ skipping 123 matching lines @@
     if not os.path.isdir(self._dir):
       raise Exception('Asset %s does not exist!' % self._name)
 
     # Remove the asset.
     subprocess.check_call([utils.GIT, 'rm', '-rf', self._dir])
     if os.path.isdir(self._dir):
       shutil.rmtree(self._dir)
 
     # We *could* remove all uploaded versions of the asset in Google Storage but
     # we choose not to be that destructive.