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

Side by Side Diff: testing/android/generate_native_test.py

Issue 11185069: Remove redundant option from script. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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 | 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 (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 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 # On Android we build unit test bundles as shared libraries. To run 7 # On Android we build unit test bundles as shared libraries. To run
8 # tests, we launch a special "test runner" apk which loads the library 8 # tests, we launch a special "test runner" apk which loads the library
9 # then jumps into it. Since java is required for many tests 9 # then jumps into it. Since java is required for many tests
10 # (e.g. PathUtils.java), a "pure native" test bundle is inadequate. 10 # (e.g. PathUtils.java), a "pure native" test bundle is inadequate.
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 parser.add_option('--native_library', 163 parser.add_option('--native_library',
164 help='Full name of native shared library test bundle') 164 help='Full name of native shared library test bundle')
165 parser.add_option('--jars', 165 parser.add_option('--jars',
166 help='Space separated list of jars to be included') 166 help='Space separated list of jars to be included')
167 parser.add_option('--output', 167 parser.add_option('--output',
168 help='Output directory for generated files.') 168 help='Output directory for generated files.')
169 parser.add_option('--app_abi', default='armeabi', 169 parser.add_option('--app_abi', default='armeabi',
170 help='ABI for native shared library') 170 help='ABI for native shared library')
171 parser.add_option('--strip-binary', 171 parser.add_option('--strip-binary',
172 help='Binary to use for stripping the native libraries.') 172 help='Binary to use for stripping the native libraries.')
173 parser.add_option('--sdk-build', type='int', default=1,
174 help='Unless set to 0, build the generated apk with ant. '
175 'Otherwise assume compiling within the Android '
176 'source tree using Android.mk.')
177 parser.add_option('--ant-args', action='append', 173 parser.add_option('--ant-args', action='append',
178 help='extra args for ant') 174 help='extra args for ant')
179 175
180 options, _ = parser.parse_args(argv) 176 options, _ = parser.parse_args(argv)
181 177
182 # It is not an error to specify no native library; the apk should 178 # It is not an error to specify no native library; the apk should
183 # still be generated and build. It will, however, print 179 # still be generated and build. It will, however, print
184 # NATIVE_LOADER_FAILED when run. 180 # NATIVE_LOADER_FAILED when run.
185 if not options.output: 181 if not options.output:
186 raise Exception('No output directory specified for generated files') 182 raise Exception('No output directory specified for generated files')
(...skipping 15 matching lines...) Expand all
202 jars=jar_list, 198 jars=jar_list,
203 strip_binary=options.strip_binary, 199 strip_binary=options.strip_binary,
204 output_directory=options.output, 200 output_directory=options.output,
205 target_abi=options.app_abi) 201 target_abi=options.app_abi)
206 ntag.CreateBundle() 202 ntag.CreateBundle()
207 ntag.Compile(options.ant_args) 203 ntag.Compile(options.ant_args)
208 logging.warn('COMPLETE.') 204 logging.warn('COMPLETE.')
209 205
210 if __name__ == '__main__': 206 if __name__ == '__main__':
211 sys.exit(main(sys.argv)) 207 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