summaryrefslogtreecommitdiffstats
path: root/o3d/import
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 04:24:21 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-29 04:24:21 +0000
commit718d232dfd9344414e736fbd13497ad3305ac0c4 (patch)
tree8010935a93d5026900642ec6ef292370fd3549c3 /o3d/import
parent8bf5a3eff3ae66eb2f4dae5feb1ae58dd240b4f3 (diff)
downloadchromium_src-718d232dfd9344414e736fbd13497ad3305ac0c4.zip
chromium_src-718d232dfd9344414e736fbd13497ad3305ac0c4.tar.gz
chromium_src-718d232dfd9344414e736fbd13497ad3305ac0c4.tar.bz2
linux: arm fixes
Review URL: http://codereview.chromium.org/549104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
-rw-r--r--o3d/import/archive.gyp15
-rw-r--r--o3d/import/import.gyp7
2 files changed, 0 insertions, 22 deletions
diff --git a/o3d/import/archive.gyp b/o3d/import/archive.gyp
index ec724a4..525f6c9a 100644
--- a/o3d/import/archive.gyp
+++ b/o3d/import/archive.gyp
@@ -16,21 +16,6 @@
'../../<(cgdir)/include',
'../../<(gtestdir)',
],
- 'conditions': [
- ['OS=="linux"',
- {
- 'include_dirs': [
- '/usr/include/cairo',
- '/usr/include/glib-2.0',
- '/usr/include/gtk-2.0',
- '/usr/include/pango-1.0',
- '/usr/lib/glib-2.0/include',
- '/usr/lib/gtk-2.0/include',
- '/usr/include/atk-1.0',
- ],
- },
- ],
- ],
},
'targets': [
{
diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp
index d07fd1c..9c43b72 100644
--- a/o3d/import/import.gyp
+++ b/o3d/import/import.gyp
@@ -83,13 +83,6 @@
],
'include_dirs': [
'../../third_party/glew/files/include',
- '/usr/include/cairo',
- '/usr/include/glib-2.0',
- '/usr/include/gtk-2.0',
- '/usr/include/pango-1.0',
- '/usr/lib/glib-2.0/include',
- '/usr/lib/gtk-2.0/include',
- '/usr/include/atk-1.0',
],
},
],