Merge "Capture the emulator stdout and stderr, update the log."

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/tradefed/targetprep/SdkAvdPreparer.java b/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
index 85fbf6841..aa6b433b4 100644
--- a/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
+++ b/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
@@ -115,6 +115,9 @@ public class SdkAvdPreparer implements ITargetPreparer, ITargetCleaner {
             description = "Additional argument to launch the emulator with. Can be repeated.")
     private Collection<String> mEmulatorArgs = new ArrayList<String>();
 
+    @Option(name = "verbose", description = "Use verbose for emulator output")
+    private boolean mVerbose = false;
+
     private final IRunUtil mRunUtil;
     private IDeviceManager mDeviceManager;
 
@@ -215,6 +218,11 @@ public class SdkAvdPreparer implements ITargetPreparer, ITargetCleaner {
             emulatorArgs.add("-gpu");
             emulatorArgs.add("on");
         }
+
+        if (mVerbose) {
+            emulatorArgs.add("-verbose");
+        }
+
         for (Map.Entry<String, String> propEntry : mProps.entrySet()) {
             emulatorArgs.add("-prop");
             emulatorArgs.add(String.format("%s=%s", propEntry.getKey(), propEntry.getValue()));