commit 439f6ca123bbc69c33dfb38e591641886bbabb57
author android-build SharedAccount <android-build@undroid16.corp.google.com> Thu Jan 15 16:22:10 2009 -0800
committer android-build SharedAccount <android-build@undroid16.corp.google.com> Thu Jan 15 16:22:10 2009 -0800
tree 14932413f4f45ec0d087103a950734e013fd04fe
parent 038862e152b98d0c0f355c6802beaa1ed59cefbe
parent 2eef60297a0ca1433d0824d6d662efd402709cfd

auto import from //branches/cupcake/...@126645

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index d5d8138..e40d2ce 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -144,6 +144,7 @@
     if (!strcmp(tag, "HTC_RIL") ||
         !strcmp(tag, "RILJ") ||
         !strcmp(tag, "RILC") ||
+        !strcmp(tag, "RILD") ||
         !strcmp(tag, "RIL") ||
         !strcmp(tag, "AT") ||
         !strcmp(tag, "GSM") ||

libpixelflinger/Android.mk

diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index cc381ff..63a5c84 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -48,7 +48,9 @@
 PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer
 endif
 
-LOCAL_SHARED_LIBRARIES := libcutils
+LOCAL_SHARED_LIBRARIES := \
+	libhardware_legacy	\
+	libcutils
 
 ifneq ($(TARGET_ARCH),arm)
 # Required to define logging functions on the simulator.

libpixelflinger/codeflinger/ARMAssembler.cpp

diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp
index c5edadf..ff7b0b3 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.cpp
+++ b/libpixelflinger/codeflinger/ARMAssembler.cpp
@@ -23,7 +23,7 @@
 #include <cutils/properties.h>
 
 #if defined(WITH_LIB_HARDWARE)
-#include <hardware/qemu_tracing.h>
+#include <hardware_legacy/qemu_tracing.h>
 #endif
 
 #include <private/pixelflinger/ggl_context.h>