[android] Split top-level scripts and libraries from build/android.

testing/android/generate_native_test.py

-#!/usr/bin/python
+#!/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.
 #
 # This script, generate_native_test.py, is used to generate the source
 # for an apk that wraps a unit test shared library bundle.  That
 # allows us to have a single boiler-plate application be used across
 # all unit test bundles.
 
 import logging
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 # cmd_helper.py is under ../../build/android/
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
                                              '..', 'build', 'android')))
-import cmd_helper  # pylint: disable=F0401
+from pylib import cmd_helper  # pylint: disable=F0401
 
 
 class NativeTestApkGenerator(object):
   """Generate a native test apk source tree.
 
   TODO(jrg): develop this more so the activity name is replaced as
   well.  That will allow multiple test runners to be installed at the
   same time.  (The complication is that it involves renaming a java
   class, which implies regeneration of a jni header, and on and on...)
   """
@@ skipping 171 matching lines @@
 
   if options.ant_compile:
     ntag.Compile(options.ant_args)
   else:
     ntag.CompileAndroidMk()
 
   logging.warn('COMPLETE.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))