| Index: content/content_shell.gypi
|
| diff --git a/content/content_shell.gypi b/content/content_shell.gypi
|
| index 5b811350943bc50d1eede6d874fa2b9b4546690b..dec87cf314c703e061f1bdd886fea2d38b5affb5 100644
|
| --- a/content/content_shell.gypi
|
| +++ b/content/content_shell.gypi
|
| @@ -6,13 +6,6 @@
|
| 'variables': {
|
| 'content_shell_product_name': 'Content Shell',
|
| 'content_shell_version': '99.77.34.5',
|
| - 'conditions': [
|
| - ['OS=="linux"', {
|
| - 'use_custom_freetype%': 1,
|
| - }, {
|
| - 'use_custom_freetype%': 0,
|
| - }],
|
| - ],
|
| },
|
| 'targets': [
|
| {
|
| @@ -262,6 +255,7 @@
|
| ['OS=="linux"', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:fontconfig',
|
| + '../third_party/freetype2/freetype2.gyp:freetype2',
|
| ],
|
| }],
|
| ['use_x11 == 1', {
|
| @@ -333,11 +327,6 @@
|
| '../ui/wm/wm.gyp:wm_test_support',
|
| ],
|
| }], # chromeos==1
|
| - ['use_custom_freetype==1', {
|
| - 'dependencies': [
|
| - '../third_party/freetype2/freetype2.gyp:freetype2',
|
| - ],
|
| - }],
|
| ['enable_plugins==0', {
|
| 'sources!': [
|
| 'shell/browser/shell_plugin_service_filter.cc',
|
|
|