Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2919)

Unified Diff: build/common.gypi

Issue 9699029: Remove use_skia_on_mac.gypi ; building with CG is no longer supported. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/use_skia_on_mac.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 126639)
+++ build/common.gypi (working copy)
@@ -17,9 +17,6 @@
# we need to have 'chromeos' already set).
'variables': {
'variables': {
- 'includes': [
- 'use_skia_on_mac.gypi',
- ],
'variables': {
# Whether we're building a ChromeOS build.
'chromeos%': 0,
@@ -44,10 +41,6 @@
# Disable viewport meta tag by default.
'enable_viewport%': 0,
-
- # Default setting for use_skia on mac platform.
- # This is typically overridden in use_skia_on_mac.gypi.
- 'use_skia_on_mac%': 0,
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
@@ -57,7 +50,6 @@
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
- 'use_skia_on_mac%': '<(use_skia_on_mac)',
# Compute the architecture that we're building on.
'conditions': [
@@ -109,7 +101,6 @@
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
- 'use_skia_on_mac%': '<(use_skia_on_mac)',
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -303,7 +294,7 @@
# the 'conditions' clause. Initial attempts resulted in chromium and
# webkit disagreeing on its setting.
['OS=="mac"', {
- 'use_skia%': '<(use_skia_on_mac)',
+ 'use_skia%': 1,
_cary 2012/03/14 15:59:25 Does the TODO above mean also that use_skia can't
epoger 2012/03/14 16:01:35 Yup, for now at least. My intent is to kill use_s
# Mac uses clang by default, so turn on the plugin as well.
'clang_use_chrome_plugins%': 1,
}, {
@@ -463,7 +454,6 @@
'chromeos_gtk%': '<(chromeos_gtk)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
- 'use_skia_on_mac%': '<(use_skia_on_mac)',
'use_xi2_mt%':'<(use_xi2_mt)',
'file_manager_extension%': '<(file_manager_extension)',
'webui_task_manager%': '<(webui_task_manager)',
« no previous file with comments | « no previous file | build/use_skia_on_mac.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698