# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1532077310 -7200
# Node ID 38c795cc7c4887ac3fbe22652eca5cf588da1eed
# Parent  106a0f9781d91b9964555b93f62d19afaa748278
primitives for android ndk

diff -r 106a0f9781d9 -r 38c795cc7c48 Resources/CMake/CairoConfiguration.cmake
--- a/Resources/CMake/CairoConfiguration.cmake	Sat Jul 14 11:20:07 2018 +0200
+++ b/Resources/CMake/CairoConfiguration.cmake	Fri Jul 20 11:01:50 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 106a0f9781d9 -r 38c795cc7c48 Resources/CMake/PixmanConfiguration.cmake
--- a/Resources/CMake/PixmanConfiguration.cmake	Sat Jul 14 11:20:07 2018 +0200
+++ b/Resources/CMake/PixmanConfiguration.cmake	Fri Jul 20 11:01:50 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)
     ##########################