diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-17 17:15:47 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 09:29:29 -0700 |
| commit | 83b65486beffc7c86f24c428fbb7b50bbbe189f9 (patch) | |
| tree | ab343e30dd96348d35b0957453fbf6b7b0bac56d /libpixelflinger/Android.mk | |
| parent | 4a4c9f6f98055918f1ebff06b3cc1ed622c058fe (diff) | |
| parent | e037fd7e193ecccbb5c0888e49f6d58c224bc11d (diff) | |
| download | core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.gz core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.bz2 core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.zip | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
init/devices.c
libpixelflinger/Android.mk
Diffstat (limited to 'libpixelflinger/Android.mk')
| -rw-r--r-- | libpixelflinger/Android.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 63a5c84d6..0cc85d9dc 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -48,9 +48,7 @@ ifeq ($(TARGET_ARCH),arm) PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer endif -LOCAL_SHARED_LIBRARIES := \ - libhardware_legacy \ - libcutils +LOCAL_SHARED_LIBRARIES := libcutils ifneq ($(TARGET_ARCH),arm) # Required to define logging functions on the simulator. @@ -68,11 +66,9 @@ LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) ifneq ($(BUILD_TINY_ANDROID),true) -# this is for some qemu-tracing cruft, which -# 1. should not depend on libhardware -# 2. should not be build except in emulator builds -# but this at least stops it from breaking the tiny android build -LOCAL_SHARED_LIBRARIES += libhardware +# Really this should go away entirely or at least not depend on +# libhardware, but this at least gets us built. +LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_CFLAGS += -DWITH_LIB_HARDWARE endif |