remoting/remoting_android.gypi - Issue 1231153002: Add VR desktop activity structure

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: remoting/remoting_android.gypi

Issue 1231153002: Add VR desktop activity structure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add cardboard desktop activity into conditional case Created 5 years, 5 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:

Index: remoting/remoting_android.gypi

diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi

index 5894e92f578f73e43deeacdbd0434a567998e5e0..c05119d9698b4f7b9bec5b9e662d3d94c0adc7c6 100644

--- a/remoting/remoting_android.gypi

+++ b/remoting/remoting_android.gypi

@@ -79,6 +79,7 @@

'--variables', '<(branding_path)',

'--template', '<(RULE_INPUT_PATH)',

'--locale_output', '<@(_outputs)',

+ '--define', 'ENABLE_CARDBOARD=<(enable_cardboard)',

'en',

}],

@@ -104,6 +105,7 @@

'../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib',

'../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',

'../third_party/android_tools/android_tools.gyp:google_play_services_javalib',

+ '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',

'includes': [ '../build/java.gypi' ],

'conditions' : [