Add the target ABI option for apk based test runner

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 33 matching lines @@
                    ]
 
   # Files in the destion directory that have a "replaceme" string
   # which should be replaced by the basename of the shared library.
   # Note we also update the filename if 'replaceme' is itself found in
   # the filename.
   _REPLACEME_FILES = ['AndroidManifest.xml',
                       'native_test_apk.xml',
                       'res/values/strings.xml']
 
-  def __init__(self, native_library, jars, output_directory):
+  def __init__(self, native_library, jars, output_directory, target_abi):
     self._native_library = native_library
     self._jars = jars
     self._output_directory = output_directory
+    self._target_abi = target_abi
     self._root_name = None
     if self._native_library:
       self._root_name = self._LibraryRoot()
     logging.warn('root name: %s' % self._root_name)
 
 
   def _LibraryRoot(self):
     """Return a root name for a shared library.
 
     The root name should be suitable for substitution in apk files
@@ skipping 44 matching lines @@
     for f in self._REPLACEME_FILES:
       dest = os.path.join(self._output_directory, f)
       contents = open(dest).read()
       contents = contents.replace('replaceme', self._root_name)
       dest = dest.replace('replaceme', self._root_name) # update the filename!
       open(dest, "w").write(contents)
 
   def _CopyLibraryAndJars(self):
     """Copy the shlib and jars into the apk source tree (if relevant)"""
     if self._native_library:
-      destdir = os.path.join(self._output_directory, 'libs/armeabi')
+      destdir = os.path.join(self._output_directory, 'libs/' + self._target_abi)
       if not os.path.exists(destdir):
         os.makedirs(destdir)
       dest = os.path.join(destdir, os.path.basename(self._native_library))
       logging.warn('strip %s --> %s' % (self._native_library, dest))
       strip = os.environ['STRIP']
       cmd_helper.RunCmd(
           [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):
@@ skipping 32 matching lines @@
 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('--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')
   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)
+                                output_directory=options.output,
+                                target_abi=options.app_abi)
   ntag.CreateBundle()
   if options.ant_compile:
     ntag.Compile(options.ant_args)
 
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))