Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Side by Side Diff: build/android/gyp/push_libraries.py

Issue 13485004: Extract GetSerialNumber() from inner loop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # Copyright 2013 The Chromium Authors. All rights reserved. 3 # Copyright 2013 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 """Pushes native libraries to a device. 7 """Pushes native libraries to a device.
8 8
9 """ 9 """
10 10
11 import json 11 import json
12 import optparse 12 import optparse
13 import os 13 import os
14 import sys 14 import sys
15 15
16 from util import build_utils 16 from util import build_utils
17 from util import md5_check 17 from util import md5_check
18 18
19 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..') 19 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
20 sys.path.append(BUILD_ANDROID_DIR) 20 sys.path.append(BUILD_ANDROID_DIR)
21 21
22 from pylib import android_commands 22 from pylib import android_commands
23 23
24 24
25 def DoPush(options): 25 def DoPush(options):
26 libraries = build_utils.ReadJson(options.libraries_json) 26 libraries = build_utils.ReadJson(options.libraries_json)
27 27
28 adb = android_commands.AndroidCommands() 28 adb = android_commands.AndroidCommands()
29 serial_number = adb.Adb().GetSerialNumber()
29 needs_directory = True 30 needs_directory = True
30 for lib in libraries: 31 for lib in libraries:
31 device_path = os.path.join(options.device_dir, lib) 32 device_path = os.path.join(options.device_dir, lib)
32 host_path = os.path.join(options.libraries_dir, lib) 33 host_path = os.path.join(options.libraries_dir, lib)
33 34
34 md5_stamp = '%s.%s.md5' % (host_path, adb.Adb().GetSerialNumber()) 35 md5_stamp = '%s.%s.push.md5' % (host_path, serial_number)
nilesh 2013/04/04 16:48:24 nit:md5_stamp_file is a better name for var
35 md5_checker = md5_check.Md5Checker(stamp=md5_stamp, inputs=[host_path]) 36 md5_checker = md5_check.Md5Checker(stamp=md5_stamp, inputs=[host_path])
36 if md5_checker.IsStale(): 37 if md5_checker.IsStale():
37 if needs_directory: 38 if needs_directory:
38 adb.RunShellCommand('mkdir ' + options.device_dir) 39 adb.RunShellCommand('mkdir ' + options.device_dir)
39 needs_directory = False 40 needs_directory = False
40 adb.PushIfNeeded(host_path, device_path) 41 adb.PushIfNeeded(host_path, device_path)
41 md5_checker.Write() 42 md5_checker.Write()
42 43
43 44
44 def main(argv): 45 def main(argv):
45 parser = optparse.OptionParser() 46 parser = optparse.OptionParser()
46 parser.add_option('--libraries-dir', 47 parser.add_option('--libraries-dir',
47 help='Directory that contains stripped libraries.') 48 help='Directory that contains stripped libraries.')
48 parser.add_option('--device-dir', 49 parser.add_option('--device-dir',
49 help='Device directory to push the libraries to.') 50 help='Device directory to push the libraries to.')
50 parser.add_option('--libraries-json', 51 parser.add_option('--libraries-json',
51 help='Path to the json list of native libraries.') 52 help='Path to the json list of native libraries.')
52 parser.add_option('--stamp', help='Path to touch on success.') 53 parser.add_option('--stamp', help='Path to touch on success.')
53 options, _ = parser.parse_args() 54 options, _ = parser.parse_args()
54 55
55 required_options = ['libraries_dir', 'device_dir', 'libraries_json'] 56 required_options = ['libraries_dir', 'device_dir', 'libraries_json']
56 build_utils.CheckOptions(options, parser, required=required_options) 57 build_utils.CheckOptions(options, parser, required=required_options)
57 58
58 DoPush(options) 59 DoPush(options)
59 60
60 if options.stamp: 61 if options.stamp:
61 build_utils.Touch(options.stamp) 62 build_utils.Touch(options.stamp)
62 63
63 64
64 if __name__ == '__main__': 65 if __name__ == '__main__':
65 sys.exit(main(sys.argv)) 66 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698