diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 17:10:12 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 17:10:12 +0000 |
| commit | dc684012f731cb7f2d58a27c70375b1c7ba2a3e1 (patch) | |
| tree | 107a08529c37f59cb0cb4b8b052a330bf177a013 /testing | |
| parent | 866fda16f50a07b0b00c878e7e8783482eb9e208 (diff) | |
| download | chromium_src-dc684012f731cb7f2d58a27c70375b1c7ba2a3e1.zip chromium_src-dc684012f731cb7f2d58a27c70375b1c7ba2a3e1.tar.gz chromium_src-dc684012f731cb7f2d58a27c70375b1c7ba2a3e1.tar.bz2 | |
Remove uses of Android's test runner's --ant-compile, as well as the flag itself.
It has been superseded by --sdk-build, which has already been set for all
other Chromium and WebKit users.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10855147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/android/generate_native_test.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py index c5fc1ed..c100380 100755 --- a/testing/android/generate_native_test.py +++ b/testing/android/generate_native_test.py @@ -163,7 +163,7 @@ class NativeTestApkGenerator(object): import compile_android_mk # pylint: disable=F0401 except: raise AssertionError('Not in Android source tree. ' - 'Please use --ant-compile.') + 'Please use --sdk-build.') compile_android_mk.CompileAndroidMk(self._native_library, self._output_directory) @@ -184,11 +184,6 @@ def main(argv): help='Unless set to 0, build the generated apk with ant. ' 'Otherwise assume compiling within the Android ' 'source tree using Android.mk.') - # FIXME(beverloo): Remove --ant-compile when all users adopted. - parser.add_option('--ant-compile', action='store_true', - help=('If specified, build the generated apk with ant. ' - 'Otherwise assume compiling within the Android ' - 'source tree using Android.mk.')) parser.add_option('--ant-args', action='append', help='extra args for ant') @@ -212,9 +207,9 @@ def main(argv): jars=jar_list, output_directory=options.output, target_abi=options.app_abi) - ntag.CreateBundle(options.sdk_build or options.ant_compile) + ntag.CreateBundle(options.sdk_build) - if options.sdk_build or options.ant_compile: + if options.sdk_build: ntag.Compile(options.ant_args) else: ntag.CompileAndroidMk() |