content/content.gyp - Issue 2219203002: Migrate WebVR Cardboard implementation to GVR

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content.gyp

Issue 2219203002: Migrate WebVR Cardboard implementation to GVR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gvr_third_party

Patch Set: Disabling WebVR on non-component builds Created 4 years, 4 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 529080d0996bfbffe6c4d02d24d257fedeef7aed..e40edb95ea1a7411253ea7784ee70611c3b88391 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -689,16 +689,6 @@

'java_set_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_shell_assets_copy',

« build/config/features.gni ('K') | « chrome/android/BUILD.gn ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »