commit 318f17a0050e729bce8545463b657c1d62835b5e
author Vladimir Chtchetkine <vchtchetkine@google.com> Fri Aug 27 09:09:45 2010 -0700
committer Vladimir Chtchetkine <vchtchetkine@google.com> Wed Sep 01 07:05:46 2010 -0700
tree 5bb39290ba092e29be8504c88264fb5159837b5d
parent e13168648d5947955e0fd4fbf396f891ae53921f

Fixed dependency ob core data in android/help.c

Also moved along -tcpdump option

Change-Id: I9fc53e0dc6a86e9a880d6127bf2da3ac1d7ec58a

android/main.c

diff --git a/android/main.c b/android/main.c
index 03d0ffd..c03280d 100644
--- a/android/main.c
+++ b/android/main.c
@@ -61,7 +61,6 @@
 #include "hw/goldfish_nand.h"
 
 #include "android/globals.h"
-#include "tcpdump.h"
 
 #include "android/qemulator.h"
 #include "android/display.h"
@@ -1153,12 +1152,6 @@
         opts->trace = tracePath;
     }
 
-    if (opts->tcpdump) {
-        if (qemu_tcpdump_start(opts->tcpdump) < 0) {
-            dwarning( "could not start packet capture: %s", strerror(errno));
-        }
-    }
-
     if (opts->no_cache)
         opts->cache = 0;
 
@@ -1190,6 +1183,11 @@
          }
     }
 
+    if (opts->tcpdump) {
+        args[n++] = "-tcpdump";
+        args[n++] = opts->tcpdump;
+    }
+
 #ifdef CONFIG_NAND_LIMITS
     if (opts->nand_limits) {
         args[n++] = "-nand-limits";