Revert "Revert 143261 - Upstreaming android tools"

build/android/cmd_helper.py

Index: build/android/cmd_helper.py
diff --git a/build/android/cmd_helper.py b/build/android/cmd_helper.py
old mode 100644
new mode 100755
index 901cbe9aed76e110da5f2c06bc652fcda522fb00..9d688f731fe750b7e497f9b70ead8398dffa671a
--- a/build/android/cmd_helper.py
+++ b/build/android/cmd_helper.py
@@ -1,7 +1,11 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+#!/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.
 
+"""A wrapper for subprocess to make calling shell commands easier."""
+
 
 import logging
 import subprocess
@@ -15,13 +19,16 @@ def RunCmd(args, cwd=None):
       the string or the first item in the args sequence.
     cwd: If not None, the subprocess's current directory will be changed to
       |cwd| before it's executed.
+
+  Returns:
+    Return code from the command execution.
   """
   logging.info(str(args) + ' ' + (cwd or ''))
   p = subprocess.Popen(args=args, cwd=cwd)
   return p.wait()
 
 
-def GetCmdOutput(args, cwd=None):
+def GetCmdOutput(args, cwd=None, shell=False):
   """Open a subprocess to execute a program and returns its output.
 
   Args:
@@ -29,10 +36,15 @@ def GetCmdOutput(args, cwd=None):
       the string or the first item in the args sequence.
     cwd: If not None, the subprocess's current directory will be changed to
       |cwd| before it's executed.
+    shell: Whether to execute args as a shell command.
+
+  Returns:
+    Captures and returns the command's stdout.
+    Prints the command's stderr to logger (which defaults to stdout).
   """
   logging.info(str(args) + ' ' + (cwd or ''))
   p = subprocess.Popen(args=args, cwd=cwd, stdout=subprocess.PIPE,
-                       stderr=subprocess.PIPE)
+                       stderr=subprocess.PIPE, shell=shell)
   stdout, stderr = p.communicate()
   if stderr:
     logging.critical(stderr)