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

liblog/logd_write.c

@@ -144,6 +144,7 @@ int __android_log_write(int prio, const char *tag, const char *msg)
     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

@@ -48,7 +48,9 @@ ifeq ($(TARGET_ARCH),arm)
 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

@@ -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>