Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1008 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', | 1008 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', |
| 1009 }], | 1009 }], |
| 1010 | 1010 |
| 1011 # Turn on JNI generation optimizations on non-WebView builds. | 1011 # Turn on JNI generation optimizations on non-WebView builds. |
| 1012 ['OS=="android" and android_webview_build==0', { | 1012 ['OS=="android" and android_webview_build==0', { |
| 1013 'optimize_jni_generation%': 1, | 1013 'optimize_jni_generation%': 1, |
| 1014 }, { | 1014 }, { |
| 1015 'optimize_jni_generation%': 0, | 1015 'optimize_jni_generation%': 0, |
| 1016 }], | 1016 }], |
| 1017 | 1017 |
| 1018 # TODO(baixo): Enable v8_use_external_startup_data | 1018 # TODO(baixo): Enable v8_use_external_startup_data for Windows and Mac - |
| 1019 # http://crbug.com/421063 | 1019 # http://crbug.com/421063 |
| 1020 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0', { | 1020 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0 and (OS=="android" or OS=="linux")', { |
|
rmcilroy
2014/11/07 23:46:00
Please remove this change from this CL
| |
| 1021 'v8_use_external_startup_data': 0, | 1021 'v8_use_external_startup_data': 1, |
| 1022 }, { | 1022 }, { |
| 1023 'v8_use_external_startup_data': 0, | 1023 'v8_use_external_startup_data': 0, |
| 1024 }], | 1024 }], |
| 1025 ], | 1025 ], |
| 1026 | 1026 |
| 1027 # Set this to 1 to enable use of concatenated impulse responses | 1027 # Set this to 1 to enable use of concatenated impulse responses |
| 1028 # for the HRTF panner in WebAudio. | 1028 # for the HRTF panner in WebAudio. |
| 1029 'use_concatenated_impulse_responses': 1, | 1029 'use_concatenated_impulse_responses': 1, |
| 1030 | 1030 |
| 1031 # You can set the variable 'use_official_google_api_keys' to 1 | 1031 # You can set the variable 'use_official_google_api_keys' to 1 |
| (...skipping 4890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5922 # settings in target dicts. SYMROOT is a special case, because many other | 5922 # settings in target dicts. SYMROOT is a special case, because many other |
| 5923 # Xcode variables depend on it, including variables such as | 5923 # Xcode variables depend on it, including variables such as |
| 5924 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5924 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5925 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5925 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5926 # files to appear (when present) in the UI as actual files and not red | 5926 # files to appear (when present) in the UI as actual files and not red |
| 5927 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5927 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5928 # and therefore SYMROOT, needs to be set at the project level. | 5928 # and therefore SYMROOT, needs to be set at the project level. |
| 5929 'SYMROOT': '<(DEPTH)/xcodebuild', | 5929 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5930 }, | 5930 }, |
| 5931 } | 5931 } |
| OLD | NEW |