diff options
| author | Brian Swetland <swetland@google.com> | 2008-12-23 22:29:27 -0800 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2008-12-23 22:29:27 -0800 |
| commit | 5a326952d72e7d4242a0664a6d9f27f4126beaa9 (patch) | |
| tree | 6ab18c5d6449f8ff90773de156a12b1c58e6e2b7 /libpixelflinger | |
| parent | 77d0c65b950570edd5241a8f2ebecfc3acbc5135 (diff) | |
| download | system_core-5a326952d72e7d4242a0664a6d9f27f4126beaa9.tar.gz system_core-5a326952d72e7d4242a0664a6d9f27f4126beaa9.tar.bz2 system_core-5a326952d72e7d4242a0664a6d9f27f4126beaa9.zip | |
fix TINY ANDROID build
A better fix would be to banish this qemu tracing stuff from libhardware
and also banish it from non-emulator builds, but this at least gets the
minimal build building again.
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/Android.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 6edc56fec..cc381ff0d 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 \ - libcutils +LOCAL_SHARED_LIBRARIES := libcutils ifneq ($(TARGET_ARCH),arm) # Required to define logging functions on the simulator. @@ -63,15 +61,23 @@ 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) +# 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 +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 |