Nuke unused test code.

testing/android/generate_native_test.py

Index: testing/android/generate_native_test.py
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py
index aff4f70df2fd66b27c2a40f6395b3542bd10247c..a6167458f0e6efab14340f8dec9eeff508f9392a 100755
--- a/testing/android/generate_native_test.py
+++ b/testing/android/generate_native_test.py
@@ -159,17 +159,6 @@ class NativeTestApkGenerator(object):
       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',
@@ -222,8 +211,8 @@ def main(argv):
   if options.sdk_build:

[Yaron, 2012/10/10 01:51:33]

Just remove the sdk_build option entirely

[shashi, 2012/10/10 03:41:11]

I have removed the use of option in code, but could not actually remove it,
since Webkit uses it. 
So now the option is a no-op.
Once I land this, will make corresponding change in Webkit to remove the use of
sdk_build option and then remove it from parser options.

     ntag.Compile(options.ant_args)
   else:
-    ntag.CompileAndroidMk()
-
+    raise AssertionError('Not in Android source tree. '
+                         'Please use --sdk-build.')
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':