Chromium support of running DumpRenderTree as an apk on Android

testing/android/generate_native_test.py

 #!/usr/bin/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 118 matching lines @@
           [strip, '--strip-unneeded', self._native_library, '-o', dest])
     if self._jars:
       destdir = os.path.join(self._output_directory, '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):
+  def CreateBundle(self, ant_compile):
     """Create the apk bundle source and assemble components."""
+    if not ant_compile:
+      self._SOURCE_FILES.append('Android.mk')
+      self._REPLACEME_FILES.append('Android.mk')
     self._CopyTemplateFiles()
     self._ReplaceStrings()
     self._CopyLibraryAndJars()
 
   def Compile(self, ant_args):
     """Build the generated apk with ant.
 
     Args:
       ant_args: extra args to pass to ant
     """
     cmd = ['ant']
     if ant_args:
       cmd.append(ant_args)
     cmd.extend(['-buildfile',
                 os.path.join(self._output_directory, 'native_test_apk.xml')])
     logging.warn(cmd)
     p = subprocess.Popen(cmd, stderr=subprocess.STDOUT)
     (stdout, _) = p.communicate()
     logging.warn(stdout)
     if p.returncode != 0:
       logging.error('Ant return code %d' % p.returncode)
       sys.exit(p.returncode)
 
+  def CompileAndroidMk(self):
+    """Build the generated apk within Android source tree using Android.mk."""
+    try:
+      import compile_android_mk  # pylint: disable=F0401
+    except:
+      raise AssertionError('Not in Android source tree. '
+                           'Please use --ant-compile.')
+    compile_android_mk.CompileAndroidMk(self._native_library,
+                                        self._output_directory)
+
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--verbose',
                     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('--output',
                     help='Output directory for generated files.')
   parser.add_option('--ant-compile', action='store_true',
-                    help='If specified, build the generated apk with ant')
+                    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')
 
+  # Ignore --ant-compile when building with Android source.
+  if 'ANDROID_BUILD_TOP' in os.environ:
+    options.ant_compile = False
+
   ntag = NativeTestApkGenerator(native_library=options.native_library,
                                 jars=options.jar,
                                 output_directory=options.output)
-  ntag.CreateBundle()
+  ntag.CreateBundle(options.ant_compile)
+
   if options.ant_compile:
     ntag.Compile(options.ant_args)
+  else:
+    ntag.CompileAndroidMk()
 
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))