diff -r 000000000000 -r 6474c204b198 gfx/cairo/libpixman/src/Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/cairo/libpixman/src/Makefile.in	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ifeq ($(OS_TARGET),Android)
+MODULE_OPTIMIZE_FLAGS = -O2
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+# Disable spammy "missing initializer" GCC warning
+ifdef GNU_CC
+CFLAGS += -Wno-missing-field-initializers
+endif # GNU_CC
+
+# The ARM asm functions here don't appreciate being called by functions
+# compiled with -mapcs-frame.  See bug 832752.
+CXXFLAGS := $(filter-out -mapcs-frame,$(CXXFLAGS))
+CFLAGS := $(filter-out -mapcs-frame,$(CFLAGS))