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

Side by Side Diff: build/common.gypi

Issue 1321383002: Revert of Android WebVR implementation, Cardboard 0.5.5 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | build/config/features.gni » ('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 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 1023 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
1024 }, { 1024 }, {
1025 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', 1025 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86',
1026 }], 1026 }],
1027 1027
1028 ['sysroot!=""', { 1028 ['sysroot!=""', {
1029 'pkg-config': '<(chroot_cmd) <(DEPTH)/build/linux/pkg-config-wrapper " <(sysroot)" "<(target_arch)" "<(system_libdir)"', 1029 'pkg-config': '<(chroot_cmd) <(DEPTH)/build/linux/pkg-config-wrapper " <(sysroot)" "<(target_arch)" "<(system_libdir)"',
1030 }, { 1030 }, {
1031 'pkg-config': 'pkg-config' 1031 'pkg-config': 'pkg-config'
1032 }], 1032 }],
1033 ],
1033 1034
1034 # Enable WebVR support by default on Android 1035 # WebVR support disabled until platform implementations have been added
1035 # Still requires command line flag to access API 1036 'enable_webvr%': 0,
1036 ['OS=="android"', {
1037 'enable_webvr%': 1,
1038 }, {
1039 'enable_webvr%': 0,
1040 }],
1041 ],
1042 1037
1043 # Setting this to '0' will cause V8's startup snapshot to be 1038 # Setting this to '0' will cause V8's startup snapshot to be
1044 # embedded in the binary instead of being a external files. 1039 # embedded in the binary instead of being a external files.
1045 'v8_use_external_startup_data%': 1, 1040 'v8_use_external_startup_data%': 1,
1046 1041
1047 # Set this to 1 to enable use of concatenated impulse responses 1042 # Set this to 1 to enable use of concatenated impulse responses
1048 # for the HRTF panner in WebAudio. 1043 # for the HRTF panner in WebAudio.
1049 'use_concatenated_impulse_responses': 1, 1044 'use_concatenated_impulse_responses': 1,
1050 1045
1051 # You can set the variable 'use_official_google_api_keys' to 1 1046 # You can set the variable 'use_official_google_api_keys' to 1
(...skipping 5263 matching lines...) Expand 10 before | Expand all | Expand 10 after
6315 # settings in target dicts. SYMROOT is a special case, because many other 6310 # settings in target dicts. SYMROOT is a special case, because many other
6316 # Xcode variables depend on it, including variables such as 6311 # Xcode variables depend on it, including variables such as
6317 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6312 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6318 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6313 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6319 # files to appear (when present) in the UI as actual files and not red 6314 # files to appear (when present) in the UI as actual files and not red
6320 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6315 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6321 # and therefore SYMROOT, needs to be set at the project level. 6316 # and therefore SYMROOT, needs to be set at the project level.
6322 'SYMROOT': '<(DEPTH)/xcodebuild', 6317 'SYMROOT': '<(DEPTH)/xcodebuild',
6323 }, 6318 },
6324 } 6319 }
OLDNEW
« no previous file with comments | « no previous file | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698