commit 2eef60297a0ca1433d0824d6d662efd402709cfd
author The Android Open Source Project <initial-contribution@android.com> Thu Jan 15 16:12:14 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Jan 15 16:12:14 2009 -0800
tree 882019445ab5b3bfcb6a2fdce0fa39084bf9340c
parent 5ae090ed949cea9d1e7ab1552b455a229f8f9757

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 6edc56f..510e11e 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -49,7 +49,7 @@
 endif
 
 LOCAL_SHARED_LIBRARIES := \
-	libhardware	\
+	libhardware_legacy	\
 	libcutils
 
 ifneq ($(TARGET_ARCH),arm)

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>