diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:36 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:36 -0800 |
| commit | 261ed7551e3234aa437658796afdc4eb372da9d7 (patch) | |
| tree | 84419eb00becc399b74f121457bf74df8537dd6d /libpixelflinger | |
| parent | 1b8e5a6b14ca850920e19b3dfae41e6494475c1a (diff) | |
| download | system_core-261ed7551e3234aa437658796afdc4eb372da9d7.zip system_core-261ed7551e3234aa437658796afdc4eb372da9d7.tar.gz system_core-261ed7551e3234aa437658796afdc4eb372da9d7.tar.bz2 | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 510e11e..50eb5f5 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. @@ -63,15 +61,19 @@ endif # Shared library # -ifneq ($(BUILD_TINY_ANDROID),true) LOCAL_MODULE:= libpixelflinger LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) -LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) -DWITH_LIB_HARDWARE +LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) +ifneq ($(BUILD_TINY_ANDROID),true) +# 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 ifeq ($(TARGET_ARCH),arm) LOCAL_WHOLE_STATIC_LIBRARIES := libpixelflinger_armv6 endif include $(BUILD_SHARED_LIBRARY) -endif # # Static library version |