Merge "Fix OSX emulator-[arm|mips] debug builds"
diff --git a/Makefile.target b/Makefile.target
index 9ebe90f..0377cdd 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -87,8 +87,7 @@
     arm/pic.c \
     arm/boot.c \
     android/goldfish/interrupt.c \
-    android/goldfish/timer.c \
-    android/goldfish/trace.c \
+    android/goldfish/timer.c
 
 # The following sources must be compiled with the final executables
 # because they contain device_init() or machine_init() statements.
@@ -133,7 +132,6 @@
     mips/mips_pic.c \
     android/goldfish/interrupt.c \
     android/goldfish/timer.c \
-    android/goldfish/trace.c \
     mips/cputimer.c \
     mips/mips_int.c