summaryrefslogtreecommitdiffstats
path: root/gpu/gles2_conform_support
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-05 00:21:22 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-05 00:21:22 +0000
commita13283ccd0eef981bd92b5ba3b78c7d1b4a678f5 (patch)
tree2cb114cfcd3d89203d045c56ec2af4d2d52cf9b0 /gpu/gles2_conform_support
parentb09be0a7dace2e86516a2661c9c504d640abed7c (diff)
downloadchromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.zip
chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.gz
chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.bz2
Remove TOOLKIT_USES_GTK and consolidate it into TOOLKIT_GTK
Add gtk dependency to base.gyp for android host_os="linux" case BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9969080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
-rw-r--r--gpu/gles2_conform_support/native/main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/gles2_conform_support/native/main.cc b/gpu/gles2_conform_support/native/main.cc
index fd3dc75..99d9858 100644
--- a/gpu/gles2_conform_support/native/main.cc
+++ b/gpu/gles2_conform_support/native/main.cc
@@ -5,7 +5,7 @@
#include "base/at_exit.h"
#include "base/message_loop.h"
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h>
#endif
@@ -18,7 +18,7 @@ extern "C" {
}
int main(int argc, char *argv[]) {
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
gtk_init(&argc, &argv);
#endif