summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2015-11-07 14:57:36 +0100
committerEthan Yonker <dees_troy@teamw.in>2015-11-07 14:57:36 +0100
commit2c80efa0c8baba68b034122ec519cc1d99dfc35c (patch)
tree6d55ad7e7def863ec13218508f63d9da7fb90985
parentFix bution action position when using textplacement TEXT_ONLY_RIGHT (diff)
downloadandroid_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.tar
android_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.tar.gz
android_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.tar.bz2
android_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.tar.lz
android_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.tar.xz
android_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.tar.zst
android_bootable_recovery-2c80efa0c8baba68b034122ec519cc1d99dfc35c.zip
Diffstat (limited to '')
-rw-r--r--libpixelflinger/Android.mk8
-rw-r--r--minuitwrp/Android.mk2
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