diff options
| author | android-build SharedAccount <android-build@undroid16.corp.google.com> | 2009-01-15 16:22:10 -0800 |
|---|---|---|
| committer | android-build SharedAccount <android-build@undroid16.corp.google.com> | 2009-01-15 16:22:10 -0800 |
| commit | 439f6ca123bbc69c33dfb38e591641886bbabb57 (patch) | |
| tree | 14932413f4f45ec0d087103a950734e013fd04fe /libpixelflinger | |
| parent | 038862e152b98d0c0f355c6802beaa1ed59cefbe (diff) | |
| parent | 2eef60297a0ca1433d0824d6d662efd402709cfd (diff) | |
| download | system_core-439f6ca123bbc69c33dfb38e591641886bbabb57.tar.gz system_core-439f6ca123bbc69c33dfb38e591641886bbabb57.tar.bz2 system_core-439f6ca123bbc69c33dfb38e591641886bbabb57.zip | |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 4 | ||||
| -rw-r--r-- | libpixelflinger/codeflinger/ARMAssembler.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index cc381ff0d..63a5c84d6 100644 --- a/libpixelflinger/Android.mk +++ b/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. diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp index c5edadf82..ff7b0b3e0 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> |