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

Unified Diff: content/content.gyp

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated to use Mojo as requested by eng review Created 5 years, 7 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
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 1a9804dfa6e71a6a60358f6f92c1777b0b745e08..9cfc1ce317a7c84673e5ea1e43b601726a91347d 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -584,9 +584,19 @@
'type': 'none',
'dependencies': [
'java_set_jni_headers',
- 'motionevent_jni_headers'
+ 'motionevent_jni_headers',
],
'includes': [ 'content_jni.gypi' ],
+ 'conditions': [
+ ['enable_webvr==1', {
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/browser/input/CardboardVRDevice.java',
+ ],
+ 'dependencies': [
+ '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
+ ],
+ }],
+ ],
},
{
'target_name': 'content_icudata',

Powered by Google App Engine
This is Rietveld 408576698