From e10fdf0afcc020f8b228bf712fa7219cb18c9c24 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Fri, 21 Sep 2018 16:14:50 -0700
Subject: [PATCH] Enable SIMD in pixman

---
 project/Build.xml  | 8 ++++++++
 project/lib/pixman | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/project/Build.xml b/project/Build.xml
index aaa0f08c9..d312db716 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -322,6 +322,13 @@
 
 	</files>
 
+	<files id="android-cpufeatures">
+
+		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android"/>
+		<file name="${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.c" />
+
+	</files>
+
 	<include name="lib/cairo/files.xml" />
 	<include name="lib/curl/files.xml" />
 	<include name="lib/efsw/files.xml" />
@@ -353,6 +360,7 @@
 		<outdir name="${OUTPUT_DIR}/${BINDIR}" />
 
 		<files id="lime" />
+		<files id="android-cpufeatures" if="android" />
 
 		<files id="native-toolkit-cairo" if="LIME_CAIRO" />
 		<files id="native-toolkit-curl" if="LIME_CURL" />
diff --git a/project/lib/pixman b/project/lib/pixman
index 1d0d8e8b6..349852531 160000
--- a/project/lib/pixman
+++ b/project/lib/pixman
@@ -1 +1 @@
-Subproject commit 1d0d8e8b657068498b8cdac6aac091a53b08fb43
+Subproject commit 3498525311af1f3ff94ab631c1e8f9be8959bdec