From 80cbee3d32bc096e654788cbd54823eafe69028c Mon Sep 17 00:00:00 2001 From: "spang@chromium.org" Date: Tue, 19 Nov 2013 20:17:16 +0000 Subject: [PATCH] ozone: Support building without cairo This adds a use_cairo gyp variable that removes cairo from the build. To build skia without cairo, we need the code in bitmap_platform_device_android.cc. To make all platforms build the correct files, rename bitmap_platform_device_linux to bitmap_platform_device_cairo and rename bitmap_platform_device_android to bitmap_platform_device_skia. We'll use bitmap_platform_device_skia for Android and for embedded content shell. BUG=318315, 318413 Review URL: https://codereview.chromium.org/59133008 git-svn-id: http://src.chromium.org/svn/trunk/src/build@236037 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 6f40a2ca9..b967fdaed 100644 --- a/common.gypi +++ b/common.gypi @@ -520,11 +520,13 @@ 'use_glib%': 1, }], - # Flags to use pango. + # Flags to use pango and cairo. ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 'use_pango%': 0, + 'use_cairo%': 0, }, { 'use_pango%': 1, + 'use_cairo%': 1, }], # DBus usage. @@ -853,6 +855,7 @@ 'use_dbus%': '<(use_dbus)', 'use_glib%': '<(use_glib)', 'use_pango%': '<(use_pango)', + 'use_cairo%': '<(use_cairo)', 'use_ozone%': '<(use_ozone)', 'use_ozone_evdev%': '<(use_ozone_evdev)', 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', @@ -2053,6 +2056,9 @@ ['use_ash==1', { 'defines': ['USE_ASH=1'], }], + ['use_cairo==1', { + 'defines': ['USE_CAIRO=1'], + }], ['use_cras==1', { 'defines': ['USE_CRAS=1'], }],