| Index: chrome/chrome.gyp
|
| diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
|
| index 80fd58c3e1380d6758c9ce8e4ffe75a741c44a1c..13a64a0d073258a549e583e906a9b674b9d5727a 100644
|
| --- a/chrome/chrome.gyp
|
| +++ b/chrome/chrome.gyp
|
| @@ -73,6 +73,10 @@
|
| }],
|
| ],
|
| },],
|
| + ['os_posix==1 and OS!="mac" and OS!="linux"', {
|
| + 'platform_locale_settings_grd':
|
| + 'app/resources/locale_settings_linux.grd',
|
| + },],
|
| ['OS=="mac"', {
|
| 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
|
| 'nacl_defines': [
|
| @@ -457,7 +461,7 @@
|
| 'browser/debugger/inspectable_tab_proxy.h',
|
| ],
|
| 'conditions': [
|
| - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
|
| + ['toolkit_uses_gtk==1', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| @@ -481,7 +485,7 @@
|
| '..',
|
| ],
|
| 'conditions': [
|
| - ['OS=="linux"', {
|
| + ['toolkit_uses_gtk==1', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| @@ -702,7 +706,7 @@
|
| 'browser/sync/util/data_encryption.h',
|
| ],
|
| }],
|
| - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
|
| + ['toolkit_uses_gtk==1', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| @@ -833,7 +837,7 @@
|
| 'service/cloud_print/print_system_win.cc',
|
| ],
|
| }],
|
| - ['OS=="linux"', {
|
| + ['toolkit_uses_gtk==1', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| ],
|
| @@ -1520,7 +1524,7 @@
|
| },
|
| ]}, # 'targets'
|
| ], # OS=="win"
|
| - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
|
| + ['os_posix==1 and OS!="mac"', {
|
| 'targets': [{
|
| 'target_name': 'packed_resources',
|
| 'type': 'none',
|
| @@ -1621,7 +1625,7 @@
|
| },
|
| ],
|
| }], # targets
|
| - }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
|
| + }], # os_posix==1 and OS!="mac"
|
| ], # 'conditions'
|
| }
|
|
|
|
|