diff options
author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 20:17:49 +0000 |
---|---|---|
committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 20:17:49 +0000 |
commit | a44d12100141c09e8cbb73d19fdf11a6febd0148 (patch) | |
tree | e27a7d73a435b13f65851452b2d0bdec1cb24de2 /testing | |
parent | 1a695bc286bb24e8c7ba213cae5923c8558b2f1b (diff) | |
download | chromium_src-a44d12100141c09e8cbb73d19fdf11a6febd0148.zip chromium_src-a44d12100141c09e8cbb73d19fdf11a6febd0148.tar.gz chromium_src-a44d12100141c09e8cbb73d19fdf11a6febd0148.tar.bz2 |
Add APK targets for content_unittests and net_unittests.
- Add a gyp template to simplify adding new targets.
- Add support for multiple jars in the test APK.
BUG=125059
TEST=
Review URL: https://chromiumcodereview.appspot.com/10399126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rwxr-xr-x | testing/android/generate_native_test.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py index 2062144..bd7c136 100755 --- a/testing/android/generate_native_test.py +++ b/testing/android/generate_native_test.py @@ -168,8 +168,8 @@ def main(argv): help='Be verbose') parser.add_option('--native_library', help='Full name of native shared library test bundle') - parser.add_option('--jar', action='append', - help='Include this jar; can be specified multiple times') + parser.add_option('--jars', + help='Space separated list of jars to be included') parser.add_option('--output', help='Output directory for generated files.') parser.add_option('--ant-compile', action='store_true', @@ -188,8 +188,12 @@ def main(argv): if options.verbose: logging.basicConfig(level=logging.DEBUG, format=' %(message)s') + # Remove all quotes from the jars string + jar_list = [] + if options.jars: + jar_list = options.jars.replace('"', '').split() ntag = NativeTestApkGenerator(native_library=options.native_library, - jars=options.jar, + jars=jar_list, output_directory=options.output) ntag.CreateBundle() if options.ant_compile: |