From 2c80efa0c8baba68b034122ec519cc1d99dfc35c Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Sat, 7 Nov 2015 07:57:36 -0600 Subject: Update rules for libpixelfinger_twrp Change-Id: I40131f330e902afab033e810761bf98c07bbd03d --- libpixelflinger/Android.mk | 8 ++++++-- minuitwrp/Android.mk | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 693a612a7..99f026c0f 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -15,13 +15,17 @@ endif PIXELFLINGER_SRC_FILES += \ codeflinger/CodeCache.cpp \ - codeflinger/tinyutils/SharedBuffer.cpp \ - codeflinger/tinyutils/VectorImpl.cpp \ format.cpp \ clear.cpp \ raster.cpp \ buffer.cpp +ifneq ($(wildcard system/core/libpixelflinger/codeflinger/tinyutils/VectorImpl.cpp),) + PIXELFLINGER_SRC_FILES += \ + codeflinger/tinyutils/SharedBuffer.cpp \ + codeflinger/tinyutils/VectorImpl.cpp +endif + ifneq ($(TW_HAVE_X86_ACCELERATED_PIXELFLINGER),true) PIXELFLINGER_SRC_FILES += \ codeflinger/ARMAssemblerInterface.cpp \ diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk index 5daa888bb..01225c32e 100644 --- a/minuitwrp/Android.mk +++ b/minuitwrp/Android.mk @@ -121,7 +121,7 @@ ifeq ($(TW_DISABLE_TTF), true) endif LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\" -LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libjpeg libpng +LOCAL_SHARED_LIBRARIES += libft2 libz libc libcutils libjpeg libpng libutils LOCAL_STATIC_LIBRARIES += libpixelflinger_twrp LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libminuitwrp -- cgit v1.2.3