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

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: Rebased, cleaned up TouchDevice.java 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
« ui/base/touch/touch_device.h ('K') | « ui/base/touch/touch_device_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 56c2cbf767a21a24a4bf9511599a2aa44f90351e..eaa4ec673582d41f0fd8eabd54977a6f61b4dd1f 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': [
+ 'ui_base_touch_device_java_enums',
mkosiba (inactive) 2014/11/10 22:06:04 in gyp it's one target per file so the target name
mustaq 2014/11/26 16:28:45 Done.
+ ],
'variables': {
'jni_gen_package': 'ui',
},
'includes': [ '../../build/jni_generator.gypi' ],
mkosiba (inactive) 2014/11/10 22:16:54 This is your problem. You're trying to make the ru
mustaq 2014/11/26 16:28:45 Acknowledged.
},
+ {
+ # TODO(mustaq): GN version: //ui/base:ui_base_touch_device_java_enums
+ 'target_name': 'ui_base_touch_device_java_enums',
+ 'type': 'none',
+ 'variables': {
+ 'source_file': 'touch/touch_device.h',
+ },
+ 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
+ },
],
}],
],
« ui/base/touch/touch_device.h ('K') | « ui/base/touch/touch_device_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698