Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2399)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_browser.gypi

Issue 101933004: Eager Gesture Recognizer (WIP) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Starting work on Android. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index ddf7094f96ad5322b4523641e74ff29e7da4bb81..e0bacb29b7891140b5ac00066ec551314edcd7e1 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1289,7 +1289,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h',
],
'conditions': [
- ['toolkit_views==1', {
+ ['toolkit_views==1 or OS=="android"', {
'dependencies': [
'../ui/events/events.gyp:events',
],
@@ -1553,7 +1553,7 @@
['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
],
}],
- ['use_aura!=1 and OS!="win"', {
+ ['use_aura!=1 and OS!="win" and OS!="android"', {
'sources!': [
'browser/renderer_host/ui_events_helper.cc',
'browser/renderer_host/ui_events_helper.h',
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698