Nuke unused test code.

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 112 matching lines @@
            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, sdk_build):
+  def CreateBundle(self):
     """Create the apk bundle source and assemble components."""
-    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:
       ant_args: extra args to pass to ant
     """
     cmd = ['ant']
     if ant_args:
       cmd.extend(ant_args)
     cmd.append("-DAPP_ABI=" + self._target_abi)
     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 --sdk-build.')
-    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('--jars',
                     help='Space separated list of jars to be included')
   parser.add_option('--output',
                     help='Output directory for generated files.')
@@ skipping 27 matching lines @@
   # 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,
                                 strip_binary=options.strip_binary,
                                 output_directory=options.output,
                                 target_abi=options.app_abi)
-  ntag.CreateBundle(options.sdk_build)
-
-  if options.sdk_build:
-    ntag.Compile(options.ant_args)
-  else:
-    ntag.CompileAndroidMk()
-
+  ntag.CreateBundle()
+  ntag.Compile(options.ant_args)
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))