commit 6e2eb78f2b52b6fff73a72995bc4356d6e67e773
author David 'Digit' Turner <digit@android.com> Sun Dec 15 00:54:21 2013 +0100
committer David 'Digit' Turner <digit@android.com> Wed Jan 08 07:32:49 2014 +0100
tree 115950874f610b1fa88754b69abd7b8703d1a74c
parent 031d655004e505a15e92580a16a181d1d247c4d5

Move tcpdump.h -> include/android/tcpdump.h

+ tcpdump.c -> android/qemu-tcpdump.c

Change-Id: Ib3a19f62f910b6562285fab3bcc98178ea9a4e9e

Makefile.common

diff --git a/Makefile.common b/Makefile.common
index cb34601..7265bb9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -424,7 +424,6 @@
     qemu-malloc.c \
     readline.c \
     savevm.c \
-    tcpdump.c \
     android/boot-properties.c \
     android/cbuffer.c \
     android/charpipe.c \
@@ -440,6 +439,7 @@
     android/looper-qemu.c \
     android/hw-pipe-net.c \
     android/qemu-setup.c \
+    android/qemu-tcpdump.c \
     android/shaper.c \
     android/snapshot.c \
     android/async-socket-connector.c \

android/console.c

diff --git a/android/console.c b/android/console.c
index 22fdc17..a66b788 100644
--- a/android/console.c
+++ b/android/console.c
@@ -36,7 +36,7 @@
 #include "android/utils/debug.h"
 #include "android/utils/stralloc.h"
 #include "android/config/config.h"
-#include "tcpdump.h"
+#include "android/tcpdump.h"
 #include "net/net.h"
 #include "monitor/monitor.h"
 

android/qemu-tcpdump.c

diff --git a/tcpdump.c b/android/qemu-tcpdump.c
similarity index 98%
rename from tcpdump.c
rename to android/qemu-tcpdump.c
index e562253..585a5a0 100644
--- a/tcpdump.c
+++ b/android/qemu-tcpdump.c
@@ -9,7 +9,7 @@
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
 */
-#include "tcpdump.h"
+#include "android/tcpdump.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>

include/android/tcpdump.h

diff --git a/tcpdump.h b/include/android/tcpdump.h
similarity index 100%
rename from tcpdump.h
rename to include/android/tcpdump.h

net/net-android.c

diff --git a/net/net-android.c b/net/net-android.c
index 3e3c048..e5bd816 100644
--- a/net/net-android.c
+++ b/net/net-android.c
@@ -29,7 +29,7 @@
 #include <sys/time.h>
 #include <zlib.h>
 
-#include "tcpdump.h"
+#include "android/tcpdump.h"
 
 /* Needed early for HOST_BSD etc. */
 #include "config-host.h"

vl-android.c

diff --git a/vl-android.c b/vl-android.c
index eee5508..fc42fad 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -70,7 +70,7 @@
 #include "android/opengles.h"
 #include "android/multitouch-screen.h"
 #include "targphys.h"
-#include "tcpdump.h"
+#include "android/tcpdump.h"
 
 #ifdef CONFIG_MEMCHECK
 #include "memcheck/memcheck.h"