summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 18:10:30 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 18:10:30 +0000
commit594b8f5fbe9c4838ea6e3f46814986357fbbbea2 (patch)
tree9ace51b2e5c63bd5df4f76f038ced1601e8a7a18 /chrome/chrome.gyp
parent85a815ca044d81e4d32a7423a8975f2269f605ec (diff)
downloadchromium_src-594b8f5fbe9c4838ea6e3f46814986357fbbbea2.zip
chromium_src-594b8f5fbe9c4838ea6e3f46814986357fbbbea2.tar.gz
chromium_src-594b8f5fbe9c4838ea6e3f46814986357fbbbea2.tar.bz2
Adding a configuration dialog for Pinyin input method.
BUG=crosbug.com/491 BUG=crosbug.com/2623 TEST=manual Review URL: http://codereview.chromium.org/1694017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ac1a236..49bb392 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -844,6 +844,11 @@
'../build/linux/system.gyp:gtk'
],
}],
+ ['OS=="linux" and chromeos==1', {
+ 'include_dirs': [
+ '<(grit_out_dir)',
+ ],
+ }],
],
},
{
@@ -1005,6 +1010,11 @@
],
},
}],
+ ['OS=="linux" and chromeos==1', {
+ 'include_dirs': [
+ '<(grit_out_dir)',
+ ],
+ }],
['OS=="mac"', {
'link_settings': {
'libraries': [