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

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

Issue 1127233005: Don't include tested apks resources in test apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | build/android/gyp/jar_toc.py » ('j') | 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 import fnmatch 7 import fnmatch
8 import optparse 8 import optparse
9 import os 9 import os
10 import sys 10 import sys
11 11
12 from util import build_utils 12 from util import build_utils
13 from util import md5_check 13 from util import md5_check
14 14
15 15
16 def Jar(class_files, classes_dir, jar_path, manifest_file=None): 16 def Jar(class_files, classes_dir, jar_path, manifest_file=None):
17 jar_path = os.path.abspath(jar_path) 17 jar_path = os.path.abspath(jar_path)
18 18
19 # The paths of the files in the jar will be the same as they are passed in to 19 # The paths of the files in the jar will be the same as they are passed in to
20 # the command. Because of this, the command should be run in 20 # the command. Because of this, the command should be run in
21 # options.classes_dir so the .class file paths in the jar are correct. 21 # options.classes_dir so the .class file paths in the jar are correct.
22 jar_cwd = classes_dir 22 jar_cwd = classes_dir
23 class_files_rel = [os.path.relpath(f, jar_cwd) for f in class_files] 23 class_files_rel = [os.path.relpath(f, jar_cwd) for f in class_files]
24 jar_cmd = ['jar', 'cf0', jar_path] 24 jar_cmd = ['jar', 'cf0', jar_path]
25 if manifest_file: 25 if manifest_file:
26 jar_cmd[1] += 'm' 26 jar_cmd[1] += 'm'
27 jar_cmd.append(os.path.abspath(manifest_file)) 27 jar_cmd.append(os.path.abspath(manifest_file))
28 jar_cmd.extend(class_files_rel) 28 jar_cmd.extend(class_files_rel)
29 29
30 record_path = '%s.md5.stamp' % jar_path 30 with build_utils.TempDir() as temp_dir:
31 md5_check.CallAndRecordIfStale( 31 empty_file = os.path.join(temp_dir, '.empty')
32 lambda: build_utils.CheckOutput(jar_cmd, cwd=jar_cwd), 32 build_utils.Touch(empty_file)
33 record_path=record_path, 33 jar_cmd.append(os.path.relpath(empty_file, jar_cwd))
mef 2015/06/03 21:56:27 This results in files like ../../tmpPrZEqC/.empty
34 input_paths=class_files, 34 record_path = '%s.md5.stamp' % jar_path
35 input_strings=jar_cmd, 35 md5_check.CallAndRecordIfStale(
36 force=not os.path.exists(jar_path), 36 lambda: build_utils.CheckOutput(jar_cmd, cwd=jar_cwd),
37 ) 37 record_path=record_path,
38 input_paths=class_files,
39 input_strings=jar_cmd,
40 force=not os.path.exists(jar_path),
41 )
38 42
39 build_utils.Touch(jar_path, fail_if_missing=True) 43 build_utils.Touch(jar_path, fail_if_missing=True)
40 44
41 45
42 def JarDirectory(classes_dir, excluded_classes, jar_path, manifest_file=None): 46 def JarDirectory(classes_dir, excluded_classes, jar_path, manifest_file=None):
43 class_files = build_utils.FindInDirectory(classes_dir, '*.class') 47 class_files = build_utils.FindInDirectory(classes_dir, '*.class')
44 for exclude in excluded_classes: 48 for exclude in excluded_classes:
45 class_files = filter( 49 class_files = filter(
46 lambda f: not fnmatch.fnmatch(f, exclude), class_files) 50 lambda f: not fnmatch.fnmatch(f, exclude), class_files)
47 51
48 Jar(class_files, classes_dir, jar_path, manifest_file=manifest_file) 52 Jar(class_files, classes_dir, jar_path, manifest_file=manifest_file)
49 53
(...skipping 16 matching lines...) Expand all
66 excluded_classes, 70 excluded_classes,
67 options.jar_path) 71 options.jar_path)
68 72
69 if options.stamp: 73 if options.stamp:
70 build_utils.Touch(options.stamp) 74 build_utils.Touch(options.stamp)
71 75
72 76
73 if __name__ == '__main__': 77 if __name__ == '__main__':
74 sys.exit(main()) 78 sys.exit(main())
75 79
OLDNEW
« no previous file with comments | « no previous file | build/android/gyp/jar_toc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698