summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 16:11:37 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 16:11:37 +0000
commitb5c72b82b5b19a3268ea5df60b79322f7f779027 (patch)
tree27bbd22eccca76f350d0e6350e78dcd20f297104 /chrome/chrome.gyp
parentc04057c9f62073cd266eebe462dd777f8fe6d7a5 (diff)
downloadchromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.zip
chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.gz
chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.bz2
Solaris: Second set adding in Solaris as an OS option
TEST=compiles BUG=30101 Patch by James Choi <jchoi42@pha.jhu.edu>. Review URL: http://codereview.chromium.org/606075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f5dc08d..dbb2eb9 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -453,7 +453,7 @@
'browser/debugger/inspectable_tab_proxy.h',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -530,7 +530,7 @@
'plugin/command_buffer_stub.h',
],
},],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
@@ -828,7 +828,7 @@
'sync_proto',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
'../build/linux/system.gyp:gtk'
],
@@ -977,7 +977,7 @@
'browser/sync/util/data_encryption.h',
],
}],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'dependencies': [
'../build/linux/system.gyp:gtk'
],
@@ -1524,7 +1524,7 @@
},
]}, # 'targets'
], # OS=="win"
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'targets': [{
'target_name': 'packed_resources',
'type': 'none',
@@ -1610,7 +1610,7 @@
},
],
}], # targets
- }], # OS=="linux" or OS=="freebsd" or OS=="openbsd"
+ }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
], # 'conditions'
}