summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-15 00:10:51 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-15 00:10:51 +0000
commite572e29e7af3aa3e3962baaa7fa5bb83983a0ad6 (patch)
treecd565563766fdfe8c39481f729b1d84e83676192 /ui
parent249edd2a70cb9ad7616b8e125e1568ca2b314522 (diff)
downloadchromium_src-e572e29e7af3aa3e3962baaa7fa5bb83983a0ad6.zip
chromium_src-e572e29e7af3aa3e3962baaa7fa5bb83983a0ad6.tar.gz
chromium_src-e572e29e7af3aa3e3962baaa7fa5bb83983a0ad6.tar.bz2
Drop gpu command_buffer_service dependency on ui
This is a reland of r247966 that should be safe now that the dependencies on X11 libraries are cleaned up (see bug 339518). BUG=339518 R=piman@chromium.org Review URL: https://codereview.chromium.org/159373002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gl/gl.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 2ec6d76..9565e3a 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -359,5 +359,10 @@
},
],
}],
+ ['OS=="android" and android_webview_build==0', {
+ 'dependencies': [
+ '../android/ui_android.gyp:ui_java',
+ ],
+ }],
],
}