OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # | 2 # |
3 # Copyright 2016 Google Inc. | 3 # Copyright 2016 Google Inc. |
4 # | 4 # |
5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
7 | 7 |
8 | 8 |
9 """Create the asset and upload it.""" | 9 """Create the asset and upload it.""" |
10 | 10 |
11 | 11 |
12 import argparse | 12 import argparse |
13 import common | 13 import common |
14 import os | 14 import os |
15 import subprocess | 15 import subprocess |
16 import sys | 16 import sys |
17 import utils | 17 import utils |
18 | 18 |
19 | 19 |
20 def main(): | 20 def main(): |
21 parser = argparse.ArgumentParser() | 21 parser = argparse.ArgumentParser() |
| 22 parser.add_argument('--android_sdk_root') |
22 parser.add_argument('--gsutil') | 23 parser.add_argument('--gsutil') |
23 args = parser.parse_args() | 24 args = parser.parse_args() |
24 | 25 |
25 with utils.tmp_dir(): | 26 with utils.tmp_dir(): |
26 cwd = os.getcwd() | 27 cwd = os.getcwd() |
27 create_script = os.path.join(common.FILE_DIR, 'create.py') | 28 create_script = os.path.join(common.FILE_DIR, 'create.py') |
28 upload_script = os.path.join(common.FILE_DIR, 'upload.py') | 29 upload_script = os.path.join(common.FILE_DIR, 'upload.py') |
29 | 30 |
30 try: | 31 try: |
31 subprocess.check_call(['python', create_script, '-t', cwd]) | 32 cmd = ['python', create_script, '-t', cwd] |
| 33 if args.android_sdk_root: |
| 34 cmd.extend(['--android_sdk_root', args.android_sdk_root]) |
| 35 subprocess.check_call(cmd) |
| 36 |
32 cmd = ['python', upload_script, '-t', cwd] | 37 cmd = ['python', upload_script, '-t', cwd] |
33 if args.gsutil: | 38 if args.gsutil: |
34 cmd.extend(['--gsutil', args.gsutil]) | 39 cmd.extend(['--gsutil', args.gsutil]) |
35 subprocess.check_call(cmd) | 40 subprocess.check_call(cmd) |
36 except subprocess.CalledProcessError: | 41 except subprocess.CalledProcessError: |
37 # Trap exceptions to avoid printing two stacktraces. | 42 # Trap exceptions to avoid printing two stacktraces. |
38 sys.exit(1) | 43 sys.exit(1) |
39 | 44 |
40 | 45 |
41 if __name__ == '__main__': | 46 if __name__ == '__main__': |
42 main() | 47 main() |
OLD | NEW |