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

Side by Side Diff: build/common.gypi

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, 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 'enable_wifi_bootstrapping%' : 1, 1007 'enable_wifi_bootstrapping%' : 1,
1008 }], 1008 }],
1009 1009
1010 # Path to sas.dll, which provides the SendSAS function. 1010 # Path to sas.dll, which provides the SendSAS function.
1011 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx 1011 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx
1012 ['target_arch=="x64"', { 1012 ['target_arch=="x64"', {
1013 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 1013 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
1014 }, { 1014 }, {
1015 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', 1015 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86',
1016 }], 1016 }],
1017
1018 # Enable WebVR support by default on Android
1019 # Still requires command line flag to access API
1020 ['OS=="android"', {
1021 'enable_webvr%': 1,
1022 }, {
1023 'enable_webvr%': 0,
1024 }],
1017 ], 1025 ],
1018 1026
1019 # Setting this to '0' will cause V8's startup snapshot to be 1027 # Setting this to '0' will cause V8's startup snapshot to be
1020 # embedded in the binary instead of being a external files. 1028 # embedded in the binary instead of being a external files.
1021 'v8_use_external_startup_data%': 1, 1029 'v8_use_external_startup_data%': 1,
1022 1030
1023 # Set this to 1 to enable use of concatenated impulse responses 1031 # Set this to 1 to enable use of concatenated impulse responses
1024 # for the HRTF panner in WebAudio. 1032 # for the HRTF panner in WebAudio.
1025 'use_concatenated_impulse_responses': 1, 1033 'use_concatenated_impulse_responses': 1,
1026 1034
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1225 'use_lto%': '<(use_lto)', 1233 'use_lto%': '<(use_lto)',
1226 'use_lto_o2%': '<(use_lto_o2)', 1234 'use_lto_o2%': '<(use_lto_o2)',
1227 'gold_icf_level%': '<(gold_icf_level)', 1235 'gold_icf_level%': '<(gold_icf_level)',
1228 'video_hole%': '<(video_hole)', 1236 'video_hole%': '<(video_hole)',
1229 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', 1237 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)',
1230 'cfi_vptr%': '<(cfi_vptr)', 1238 'cfi_vptr%': '<(cfi_vptr)',
1231 'cfi_blacklist%': '<(cfi_blacklist)', 1239 'cfi_blacklist%': '<(cfi_blacklist)',
1232 'mac_views_browser%': '<(mac_views_browser)', 1240 'mac_views_browser%': '<(mac_views_browser)',
1233 'android_app_version_name%': '<(android_app_version_name)', 1241 'android_app_version_name%': '<(android_app_version_name)',
1234 'android_app_version_code%': '<(android_app_version_code)', 1242 'android_app_version_code%': '<(android_app_version_code)',
1243 'enable_webvr%': '<(enable_webvr)',
1235 1244
1236 # Use system protobuf instead of bundled one. 1245 # Use system protobuf instead of bundled one.
1237 'use_system_protobuf%': 0, 1246 'use_system_protobuf%': 0,
1238 1247
1239 # Use system yasm instead of bundled one. 1248 # Use system yasm instead of bundled one.
1240 'use_system_yasm%': 0, 1249 'use_system_yasm%': 0,
1241 1250
1242 # Use system ICU instead of bundled one. 1251 # Use system ICU instead of bundled one.
1243 'use_system_icu%' : 0, 1252 'use_system_icu%' : 0,
1244 1253
(...skipping 1780 matching lines...) Expand 10 before | Expand all | Expand 10 after
3025 }], 3034 }],
3026 ['enable_ipc_fuzzer==1', { 3035 ['enable_ipc_fuzzer==1', {
3027 'defines': ['ENABLE_IPC_FUZZER=1'], 3036 'defines': ['ENABLE_IPC_FUZZER=1'],
3028 }], 3037 }],
3029 ['video_hole==1', { 3038 ['video_hole==1', {
3030 'defines': ['VIDEO_HOLE=1'], 3039 'defines': ['VIDEO_HOLE=1'],
3031 }], 3040 }],
3032 ['v8_use_external_startup_data==1', { 3041 ['v8_use_external_startup_data==1', {
3033 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'], 3042 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'],
3034 }], 3043 }],
3044 ['enable_webvr==1', {
3045 'defines': ['ENABLE_WEBVR=1'],
3046 }],
3035 3047
3036 # SAFE_BROWSING_SERVICE - browser manages a safe-browsing service. 3048 # SAFE_BROWSING_SERVICE - browser manages a safe-browsing service.
3037 # SAFE_BROWSING_DB_LOCAL - service manages a local database. 3049 # SAFE_BROWSING_DB_LOCAL - service manages a local database.
3038 # SAFE_BROWSING_DB_REMOTE - service talks via API to a database 3050 # SAFE_BROWSING_DB_REMOTE - service talks via API to a database
3039 # SAFE_BROWSING_CSD - enable client-side phishing detection. 3051 # SAFE_BROWSING_CSD - enable client-side phishing detection.
3040 ['safe_browsing==1', { 3052 ['safe_browsing==1', {
3041 'defines': [ 3053 'defines': [
3042 # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING 3054 # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
3043 'FULL_SAFE_BROWSING', 3055 'FULL_SAFE_BROWSING',
3044 'SAFE_BROWSING_CSD', 3056 'SAFE_BROWSING_CSD',
(...skipping 3159 matching lines...) Expand 10 before | Expand all | Expand 10 after
6204 # settings in target dicts. SYMROOT is a special case, because many other 6216 # settings in target dicts. SYMROOT is a special case, because many other
6205 # Xcode variables depend on it, including variables such as 6217 # Xcode variables depend on it, including variables such as
6206 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6218 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6207 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6219 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6208 # files to appear (when present) in the UI as actual files and not red 6220 # files to appear (when present) in the UI as actual files and not red
6209 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6221 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6210 # and therefore SYMROOT, needs to be set at the project level. 6222 # and therefore SYMROOT, needs to be set at the project level.
6211 'SYMROOT': '<(DEPTH)/xcodebuild', 6223 'SYMROOT': '<(DEPTH)/xcodebuild',
6212 }, 6224 },
6213 } 6225 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | content/browser/renderer_host/vr_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698