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

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: 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 1009 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
1010 }, { 1010 }, {
1011 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', 1011 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86',
1012 }], 1012 }],
1013 1013
1014 ['sysroot!=""', { 1014 ['sysroot!=""', {
1015 'pkg-config': '<(chroot_cmd) <(DEPTH)/build/linux/pkg-config-wrapper " <(sysroot)" "<(target_arch)" "<(system_libdir)"', 1015 'pkg-config': '<(chroot_cmd) <(DEPTH)/build/linux/pkg-config-wrapper " <(sysroot)" "<(target_arch)" "<(system_libdir)"',
1016 }, { 1016 }, {
1017 'pkg-config': 'pkg-config' 1017 'pkg-config': 'pkg-config'
1018 }], 1018 }],
1019
1020 # Enable WebVR support by default on Android
1021 # Still requires command line flag to access API
1022 ['OS=="android"', {
1023 'enable_webvr%': 1,
1024 }, {
1025 'enable_webvr%': 0,
1026 }],
1019 ], 1027 ],
1020 1028
1021 # Setting this to '0' will cause V8's startup snapshot to be 1029 # Setting this to '0' will cause V8's startup snapshot to be
1022 # embedded in the binary instead of being a external files. 1030 # embedded in the binary instead of being a external files.
1023 'v8_use_external_startup_data%': 1, 1031 'v8_use_external_startup_data%': 1,
1024 1032
1025 # Set this to 1 to enable use of concatenated impulse responses 1033 # Set this to 1 to enable use of concatenated impulse responses
1026 # for the HRTF panner in WebAudio. 1034 # for the HRTF panner in WebAudio.
1027 'use_concatenated_impulse_responses': 1, 1035 'use_concatenated_impulse_responses': 1,
1028 1036
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1225 'gomadir%': '<(gomadir)', 1233 'gomadir%': '<(gomadir)',
1226 'use_lto%': '<(use_lto)', 1234 'use_lto%': '<(use_lto)',
1227 'use_lto_o2%': '<(use_lto_o2)', 1235 'use_lto_o2%': '<(use_lto_o2)',
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 1777 matching lines...) Expand 10 before | Expand all | Expand 10 after
3022 }], 3031 }],
3023 ['enable_ipc_fuzzer==1', { 3032 ['enable_ipc_fuzzer==1', {
3024 'defines': ['ENABLE_IPC_FUZZER=1'], 3033 'defines': ['ENABLE_IPC_FUZZER=1'],
3025 }], 3034 }],
3026 ['video_hole==1', { 3035 ['video_hole==1', {
3027 'defines': ['VIDEO_HOLE=1'], 3036 'defines': ['VIDEO_HOLE=1'],
3028 }], 3037 }],
3029 ['v8_use_external_startup_data==1', { 3038 ['v8_use_external_startup_data==1', {
3030 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'], 3039 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'],
3031 }], 3040 }],
3041 ['enable_webvr==1', {
3042 '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
3043 }],
3032 3044
3033 # SAFE_BROWSING_SERVICE - browser manages a safe-browsing service. 3045 # SAFE_BROWSING_SERVICE - browser manages a safe-browsing service.
3034 # SAFE_BROWSING_DB_LOCAL - service manages a local database. 3046 # SAFE_BROWSING_DB_LOCAL - service manages a local database.
3035 # SAFE_BROWSING_DB_REMOTE - service talks via API to a database 3047 # SAFE_BROWSING_DB_REMOTE - service talks via API to a database
3036 # SAFE_BROWSING_CSD - enable client-side phishing detection. 3048 # SAFE_BROWSING_CSD - enable client-side phishing detection.
3037 ['safe_browsing==1', { 3049 ['safe_browsing==1', {
3038 'defines': [ 3050 'defines': [
3039 # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING 3051 # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
3040 'FULL_SAFE_BROWSING', 3052 'FULL_SAFE_BROWSING',
3041 'SAFE_BROWSING_CSD', 3053 'SAFE_BROWSING_CSD',
(...skipping 3161 matching lines...) Expand 10 before | Expand all | Expand 10 after
6203 # settings in target dicts. SYMROOT is a special case, because many other 6215 # settings in target dicts. SYMROOT is a special case, because many other
6204 # Xcode variables depend on it, including variables such as 6216 # Xcode variables depend on it, including variables such as
6205 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6217 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6206 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6218 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6207 # files to appear (when present) in the UI as actual files and not red 6219 # files to appear (when present) in the UI as actual files and not red
6208 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6220 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6209 # and therefore SYMROOT, needs to be set at the project level. 6221 # and therefore SYMROOT, needs to be set at the project level.
6210 'SYMROOT': '<(DEPTH)/xcodebuild', 6222 'SYMROOT': '<(DEPTH)/xcodebuild',
6211 }, 6223 },
6212 } 6224 }
OLDNEW
« 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