# HG changeset patch
# User am@osimis.io
# Date 1535640968 -7200
# Node ID 36ebe6ec8fe833f97e449f61ce0ad55829990486
# Parent  8c8da145fefa2eebd36e504dae145429fc7ff8b1# Parent  3a8bac80535263e6fd840ff5d34babd0f5a9e45a
merged default into am-2

diff -r 8c8da145fefa -r 36ebe6ec8fe8 Resources/CMake/CairoConfiguration.cmake
--- a/Resources/CMake/CairoConfiguration.cmake	Thu Aug 30 16:52:40 2018 +0200
+++ b/Resources/CMake/CairoConfiguration.cmake	Thu Aug 30 16:56:08 2018 +0200
@@ -212,7 +212,8 @@
     # Disable vectorized instructions when targeting archicture-independent PNaCl
     set(CAIRO_DEFINITIONS "${CAIRO_DEFINITIONS};HAVE_STDINT_H=1;CAIRO_HAS_PTHREAD=1;HAVE_UINT64_T=1")
 
-  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
+  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten" OR
+          ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     # Disable vectorized instructions and threading if targeting asm.js
     set(CAIRO_DEFINITIONS "${CAIRO_DEFINITIONS};HAVE_STDINT_H=1;CAIRO_HAS_PTHREAD=0;CAIRO_NO_MUTEX=1;HAVE_UINT64_T=1")
 
diff -r 8c8da145fefa -r 36ebe6ec8fe8 Resources/CMake/PixmanConfiguration.cmake
--- a/Resources/CMake/PixmanConfiguration.cmake	Thu Aug 30 16:52:40 2018 +0200
+++ b/Resources/CMake/PixmanConfiguration.cmake	Thu Aug 30 16:56:08 2018 +0200
@@ -108,7 +108,8 @@
     # No hardware acceleration
     set(PIXMAN_DEFINITIONS "${PIXMAN_DEFINITIONS};TLS=__thread")
 
-  elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  elseif (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR
+          CMAKE_SYSTEM_NAME STREQUAL "Android")
     ##########################
     ## Emscripten (asm.js)
     ##########################
@@ -189,6 +190,7 @@
 
   elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv5te" OR
       CMAKE_SYSTEM_PROCESSOR STREQUAL "armv6" OR
+      CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR
       CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a" OR
       CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")