diff options
author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 07:54:35 +0000 |
---|---|---|
committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 07:54:35 +0000 |
commit | a1aa2c51fb05fd524f0eab7707b11b21a1fc1c87 (patch) | |
tree | 027e404ce2acf57595977a76702e091eb1bf75d9 /testing/android | |
parent | 1c7008ac8b929e2a8c5410525838651411d36dcc (diff) | |
download | chromium_src-a1aa2c51fb05fd524f0eab7707b11b21a1fc1c87.zip chromium_src-a1aa2c51fb05fd524f0eab7707b11b21a1fc1c87.tar.gz chromium_src-a1aa2c51fb05fd524f0eab7707b11b21a1fc1c87.tar.bz2 |
Reduce verbosity of Android builds.
There's a lot of boilerplate from running ant. Passing '-q' silences most of it.
BUG=164395
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/11606010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
-rwxr-xr-x | testing/android/generate_native_test.py | 14 | ||||
-rw-r--r-- | testing/android/native_test.gyp | 2 | ||||
-rw-r--r-- | testing/android/native_test_apk.xml | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py index 563112e..0dbc7d7 100755 --- a/testing/android/generate_native_test.py +++ b/testing/android/generate_native_test.py @@ -60,7 +60,7 @@ class NativeTestApkGenerator(object): self._root_name = None if self._native_library: self._root_name = self._LibraryRoot() - logging.warn('root name: %s', self._root_name) + logging.info('root name: %s', self._root_name) def _LibraryRoot(self): """Return a root name for a shared library. @@ -88,7 +88,7 @@ class NativeTestApkGenerator(object): os.makedirs(destdir) elif not '/out/' in destdir: raise Exception('Unbelievable output directory; bailing for safety') - logging.warning('rsync %s --> %s', self._SOURCE_FILES, destdir) + logging.info('rsync %s --> %s', self._SOURCE_FILES, destdir) logging.info(cmd_helper.GetCmdOutput( ['rsync', '-aRv', '--delete', '--exclude', '.svn'] + self._SOURCE_FILES + [destdir], cwd=srcdir)) @@ -100,7 +100,7 @@ class NativeTestApkGenerator(object): """ if not self._root_name: return - logging.warn('Replacing "replaceme" with ' + self._root_name) + logging.info('Replacing "replaceme" with ' + self._root_name) for f in self._REPLACEME_FILES: dest = os.path.join(self._output_directory, f) contents = open(dest).read() @@ -115,7 +115,7 @@ class NativeTestApkGenerator(object): 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) + logging.info('strip %s --> %s', self._native_library, dest) cmd_helper.RunCmd( [self._strip_binary, '--strip-unneeded', self._native_library, '-o', dest]) @@ -138,10 +138,10 @@ class NativeTestApkGenerator(object): cmd.append("-DAPP_ABI=" + self._target_abi) cmd.extend(['-buildfile', os.path.join(self._output_directory, 'native_test_apk.xml')]) - logging.warn(cmd) + logging.info(cmd) p = subprocess.Popen(cmd, stderr=subprocess.STDOUT) (stdout, _) = p.communicate() - logging.warn(stdout) + logging.info(stdout) if p.returncode != 0: logging.error('Ant return code %d', p.returncode) sys.exit(p.returncode) @@ -195,7 +195,7 @@ def main(argv): target_abi=options.app_abi) ntag.CreateBundle() ntag.Compile(options.ant_args) - logging.warn('COMPLETE.') + logging.info('COMPLETE.') if __name__ == '__main__': sys.exit(main(sys.argv)) diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp index 80fe486..06f7279 100644 --- a/testing/android/native_test.gyp +++ b/testing/android/native_test.gyp @@ -32,7 +32,7 @@ '<(PRODUCT_DIR)/replaceme_apk/replaceme-debug.apk', ], 'action': [ - 'ant', + 'ant', '-q', # TODO: All of these paths are absolute paths right now, while # we really should be using relative paths for anything that is # checked in to the Chromium tree (among which the SDK). diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml index 545568d..24e5bf5 100644 --- a/testing/android/native_test_apk.xml +++ b/testing/android/native_test_apk.xml @@ -74,7 +74,6 @@ found in the LICENSE file. <equals arg1="${build.target}" arg2="debug" /> </condition> <then> - <echo message="Copying gdbserver to the apk to enable native debugging"/> <copy todir="${out.dir}/libs/${target.abi}"> <path refid="native.libs.gdbserver"/> </copy> |