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 110 matching lines @@
           [strip, '--strip-unneeded', self._native_library, '-o', dest])
     if self._jars:
       destdir = os.path.join(self._output_directory, 'java/libs')
       if not os.path.exists(destdir):
         os.makedirs(destdir)
       for jar in self._jars:
         dest = os.path.join(destdir, os.path.basename(jar))
         logging.warn('%s --> %s', jar, dest)
         shutil.copyfile(jar, dest)
 
-  def CreateBundle(self, ant_compile):
+  def CreateBundle(self, sdk_build):
     """Create the apk bundle source and assemble components."""
-    if not ant_compile:
+    if not sdk_build:
       self._SOURCE_FILES.append('Android.mk')
       self._REPLACEME_FILES.append('Android.mk')
     self._CopyTemplateFilesAndClearDir()
     self._ReplaceStrings()
     self._CopyLibraryAndJars()
 
   def Compile(self, ant_args):
     """Build the generated apk with ant.
 
     Args:
@@ skipping 29 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('--sdk-build', type='int', default=1,
+                    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',
                     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')
 
   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=jar_list,
                                 output_directory=options.output,
                                 target_abi=options.app_abi)
-  ntag.CreateBundle(options.ant_compile)
+  ntag.CreateBundle(options.sdk_build or options.ant_compile)
 
-  if options.ant_compile:
+  if options.sdk_build or options.ant_compile:
     ntag.Compile(options.ant_args)
   else:
     ntag.CompileAndroidMk()
 
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))