aboutsummaryrefslogtreecommitdiffstats
path: root/android/protocol
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-12 10:26:09 +0200
committerDavid 'Digit' Turner <digit@android.com>2011-06-01 17:08:19 +0200
commit406a59bd0a2e7a38cd840a5c08602e3a36bd2df8 (patch)
treee9dbb51e71a14aa9118f8e9c980d4722abb04fd8 /android/protocol
parent288208c386810fef725aa448a9f46bd2772bec8c (diff)
downloadexternal_qemu-406a59bd0a2e7a38cd840a5c08602e3a36bd2df8.zip
external_qemu-406a59bd0a2e7a38cd840a5c08602e3a36bd2df8.tar.gz
external_qemu-406a59bd0a2e7a38cd840a5c08602e3a36bd2df8.tar.bz2
trace.h: rename to trace-android.h
This is done to allow for future integration of the upstream auto-generated "trace.h" header file. Change-Id: I9d1bba3320d9e8acfd7359540d3ed6695773061e
Diffstat (limited to 'android/protocol')
-rw-r--r--android/protocol/core-commands-impl.c2
-rw-r--r--android/protocol/core-commands-qemu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/protocol/core-commands-impl.c b/android/protocol/core-commands-impl.c
index 4366529..bf6da15 100644
--- a/android/protocol/core-commands-impl.c
+++ b/android/protocol/core-commands-impl.c
@@ -19,7 +19,7 @@
#include "android/android.h"
#include "android/globals.h"
#include "telephony/modem_driver.h"
-#include "trace.h"
+#include "android-trace.h"
#include "android/looper.h"
#include "android/async-utils.h"
#include "android/sync-utils.h"
diff --git a/android/protocol/core-commands-qemu.c b/android/protocol/core-commands-qemu.c
index 03fef64..76b3abb 100644
--- a/android/protocol/core-commands-qemu.c
+++ b/android/protocol/core-commands-qemu.c
@@ -19,7 +19,7 @@
#include "android/globals.h"
#include "android/hw-sensors.h"
#include "telephony/modem_driver.h"
-#include "trace.h"
+#include "android-trace.h"
#include "audio/audio.h"
#include "android/protocol/core-commands-api.h"