Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a326952 authored by Brian Swetland's avatar Brian Swetland
Browse files

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.
parent 77d0c65b

libpixelflinger/Android.mk

+12 −6
Original line number Diff line number Diff line
@@ -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