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

Unified Diff: build/common.gypi

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed rockot@'s feedback. Created 5 years, 6 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
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9399c5d17afc3e1653eb003a77500c67e06ea284..d64ffb5964217e0f7cb4b832731a4425e65897fb 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1016,6 +1016,14 @@
}, {
'pkg-config': 'pkg-config'
}],
+
+ # Enable WebVR support by default on Android
+ # Still requires command line flag to access API
+ ['OS=="android"', {
+ 'enable_webvr%': 1,
+ }, {
+ 'enable_webvr%': 0,
+ }],
],
# Setting this to '0' will cause V8's startup snapshot to be
@@ -1232,6 +1240,7 @@
'mac_views_browser%': '<(mac_views_browser)',
'android_app_version_name%': '<(android_app_version_name)',
'android_app_version_code%': '<(android_app_version_code)',
+ 'enable_webvr%': '<(enable_webvr)',
# Use system protobuf instead of bundled one.
'use_system_protobuf%': 0,
@@ -3029,6 +3038,9 @@
['v8_use_external_startup_data==1', {
'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'],
}],
+ ['enable_webvr==1', {
+ 'defines': ['ENABLE_WEBVR=1'],
jochen (gone - plz use gerrit) 2015/06/16 13:30:30 nit. just ENABLE_WEBVR, we usually don't check the
+ }],
# SAFE_BROWSING_SERVICE - browser manages a safe-browsing service.
# SAFE_BROWSING_DB_LOCAL - service manages a local database.
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698