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

Unified Diff: ui/base/ui_base.gyp

Issue 696713002: Pointer/hover media query support: platform-dependent changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build dependencies Created 6 years, 1 month 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
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 56c2cbf767a21a24a4bf9511599a2aa44f90351e..c41c75c1414c29d3dc968dfd5025702f657b54f3 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -758,11 +758,23 @@
'../android/java/src/org/chromium/ui/base/ViewAndroid.java',
'../android/java/src/org/chromium/ui/base/WindowAndroid.java',
],
+ 'dependencies': [
jdduke (slow) 2014/11/07 22:28:56 Shouldn't need this, see below.
+ 'ui_base_touch_device_java_enums',
+ ],
'variables': {
'jni_gen_package': 'ui',
},
'includes': [ '../../build/jni_generator.gypi' ],
},
+ {
+ # TODO(mustaq): GN version: //ui/base:ui_base_???
jdduke (slow) 2014/11/07 22:28:56 This should be put in ui/android/ui_android.gyp, j
+ 'target_name': 'ui_base_touch_device_java_enums',
+ 'type': 'none',
+ 'variables': {
+ 'source_file': 'touch/touch_device.h',
+ },
+ 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
+ },
],
}],
],

Powered by Google App Engine
This is Rietveld 408576698