Introduce the --sdk-build flag for Android's native test generator

testing/android/generate_native_test.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # On Android we build unit test bundles as shared libraries.  To run
 # tests, we launch a special "test runner" apk which loads the library
 # then jumps into it.  Since java is required for many tests
 # (e.g. PathUtils.java), a "pure native" test bundle is inadequate.
@@ skipping 162 matching lines @@
   parser.add_option('--verbose',
                     help='Be verbose')
   parser.add_option('--native_library',
                     help='Full name of native shared library test bundle')
   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('--app_abi', default='armeabi',
                     help='ABI for native shared library')
-  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-compile', type='int', default=0,

[nilesh, 2012/08/01 13:49:43]

Maybe we should remove "--ant-compile" from DumpRenderTree_apk first and make
"ant_compile" the default here, to avoid breaking the build.

[Peter Beverloo, 2012/08/01 15:11:56]

By following Marcus' suggestion about renaming the flag and maintaining
redundancy until WebKit has been updated, we can avoid this. If/when this lands,
it'll roll into WebKit, we'll then update all users of --ant-compile to change
to --sdk-build (with the variable), and then submit a follow-up patch removing
this code on the Chromium side.

+                    help='If set to 1, build the generated apk with ant. '
+                         'Otherwise assume compiling within the Android '
+                         'source tree using Android.mk.')
   parser.add_option('--ant-args',
                     help='extra args for ant')
 
   options, _ = parser.parse_args(argv)
 
   # It is not an error to specify no native library; the apk should
   # still be generated and build.  It will, however, print
   # NATIVE_LOADER_FAILED when run.
   if not options.output:
     raise Exception('No output directory specified for generated files')
@@ skipping 14 matching lines @@
 
   if options.ant_compile:
     ntag.Compile(options.ant_args)
   else:
     ntag.CompileAndroidMk()
 
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))