summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fuse_sideload.c4
-rw-r--r--libpixelflinger/Android.mk3
2 files changed, 7 insertions, 0 deletions
diff --git a/fuse_sideload.c b/fuse_sideload.c
index 3259c5fb4..fd06fbf1b 100644
--- a/fuse_sideload.c
+++ b/fuse_sideload.c
@@ -70,6 +70,10 @@
#define NO_STATUS 1
#define NO_STATUS_EXIT 2
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
struct fuse_data {
int ffd; // file descriptor for the fuse socket
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index d464c7707..693a612a7 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -91,6 +91,9 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
LOCAL_SRC_FILES_x86 := $(PIXELFLINGER_SRC_FILES_x86)
LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
+ifneq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
+ LOCAL_SRC_FILES += $(LOCAL_SRC_FILES_$(TARGET_ARCH))
+endif
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS)
LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)