[[ Prebuilt ]] Build libcairo thirdparty prebuilt library for Android

livecodeian · livecodeian · commit c7293b2d190e · 2019-10-21T14:50:44.000+01:00
This patch adds libcairo to the list of thirdparty liraries compiled as
prebuilt libraries for Android
diff --git a/livecode.gyp b/livecode.gyp
@@ -301,6 +301,7 @@
 							'<@(thirdparty_libs_native)',
 							'<@(thirdparty_libs_fonts)',
 							'thirdparty/libexpat/libexpat.gyp:libexpat',
+							'thirdparty/libcairo/libcairo.gyp:libcairo',
 						],
 					},
 				],
diff --git a/prebuilt/scripts/lib_versions.inc b/prebuilt/scripts/lib_versions.inc
@@ -43,4 +43,4 @@ Thirdparty_LIBS_linux="$Thirdparty_LIBS_CORE $Thirdparty_LIBS_NATIVE $Thirdparty
 Thirdparty_LIBS_win32="$Thirdparty_LIBS_CORE $Thirdparty_LIBS_NATIVE $Thirdparty_LIBS_DESKTOP"
 Thirdparty_LIBS_ios="$Thirdparty_LIBS_CORE $Thirdparty_LIBS_NATIVE libcairo"
 Thirdparty_LIBS_emscripten="$Thirdparty_LIBS_CORE $Thirdparty_LIBS_FONTS"
-Thirdparty_LIBS_android="$Thirdparty_LIBS_CORE $Thirdparty_LIBS_NATIVE $Thirdparty_LIBS_FONTS libexpat"
+Thirdparty_LIBS_android="$Thirdparty_LIBS_CORE $Thirdparty_LIBS_NATIVE $Thirdparty_LIBS_FONTS libexpat libcairo"
diff --git a/prebuilt/thirdparty.gyp b/prebuilt/thirdparty.gyp
@@ -961,6 +961,23 @@
 							],
 						},
 					],
+					[
+						'toolset_os == "android"',
+						{
+							'conditions':
+							[
+								[
+									'OS == "android"',
+									{
+										'libraries':
+										[
+											'-lcairo',
+										],
+									},
+								],
+							],
+						},
+					],
 					[
 						'toolset_os == "linux"',
 						{
