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

Unified Diff: chrome/browser/BUILD.gn

Issue 2399533002: Pull in vr_shell code for webvr (Closed)
Patch Set: review Created 4 years, 2 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: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 58c06b799b004126e4f6d3e0fbf022853d172467..d3c774c213159984b26b4534968e6262602dbc7c 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3349,8 +3349,11 @@ split_static_library("browser") {
}
}
- if (enable_vr_shell && android_java_ui) {
- defines += [ "ENABLE_VR_SHELL" ]
+ if ((enable_vr_shell || enable_webvr) && android_java_ui) {
+ if (enable_vr_shell) {
+ defines += [ "ENABLE_VR_SHELL" ]
+ }
+
deps += [ "android/vr_shell:vr_shell" ]
agrieve 2016/10/05 19:04:58 It seems this is actually the point of the change
bshe 2016/10/05 19:53:06 make sense. renamed to vr_common. We can't force e
configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
}

Powered by Google App Engine
This is Rietveld 408576698