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

Side by Side Diff: build/common.gypi

Issue 16117004: Enable the use of system python in testing. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 | net/test/python_utils.cc » ('j') | net/test/python_utils.cc » ('J')
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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 # On Linux, we build with sse2 for Chromium builds. 226 # On Linux, we build with sse2 for Chromium builds.
227 'disable_sse2%': 0, 227 'disable_sse2%': 0,
228 228
229 # Use libjpeg-turbo as the JPEG codec used by Chromium. 229 # Use libjpeg-turbo as the JPEG codec used by Chromium.
230 'use_libjpeg_turbo%': 1, 230 'use_libjpeg_turbo%': 1,
231 231
232 # Use system libjpeg. Note that the system's libjepg will be used even if 232 # Use system libjpeg. Note that the system's libjepg will be used even if
233 # use_libjpeg_turbo is set. 233 # use_libjpeg_turbo is set.
234 'use_system_libjpeg%': 0, 234 'use_system_libjpeg%': 0,
235 235
236 # Use system python instead of the one in third_party.
237 'use_system_python_in_tests%': 0,
238
236 # By default, component is set to static_library and it can be overriden 239 # By default, component is set to static_library and it can be overriden
237 # by the GYP command line or by ~/.gyp/include.gypi. 240 # by the GYP command line or by ~/.gyp/include.gypi.
238 'component%': 'static_library', 241 'component%': 'static_library',
239 242
240 # Set to select the Title Case versions of strings in GRD files. 243 # Set to select the Title Case versions of strings in GRD files.
241 'use_titlecase_in_grd_files%': 0, 244 'use_titlecase_in_grd_files%': 0,
242 245
243 # Use translations provided by volunteers at launchpad.net. This 246 # Use translations provided by volunteers at launchpad.net. This
244 # currently only works on Linux. 247 # currently only works on Linux.
245 'use_third_party_translations%': 0, 248 'use_third_party_translations%': 0,
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 'enable_printing%': '<(enable_printing)', 802 'enable_printing%': '<(enable_printing)',
800 'enable_google_now%': '<(enable_google_now)', 803 'enable_google_now%': '<(enable_google_now)',
801 'enable_language_detection%': '<(enable_language_detection)', 804 'enable_language_detection%': '<(enable_language_detection)',
802 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 805 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
803 'disable_ftp_support%': '<(disable_ftp_support)', 806 'disable_ftp_support%': '<(disable_ftp_support)',
804 'enable_task_manager%': '<(enable_task_manager)', 807 'enable_task_manager%': '<(enable_task_manager)',
805 'sas_dll_path%': '<(sas_dll_path)', 808 'sas_dll_path%': '<(sas_dll_path)',
806 'wix_path%': '<(wix_path)', 809 'wix_path%': '<(wix_path)',
807 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 810 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
808 'use_system_libjpeg%': '<(use_system_libjpeg)', 811 'use_system_libjpeg%': '<(use_system_libjpeg)',
812 'use_system_python_in_tests%': '<(use_system_python_in_tests)',
809 'android_webview_build%': '<(android_webview_build)', 813 'android_webview_build%': '<(android_webview_build)',
810 'gyp_managed_install%': 0, 814 'gyp_managed_install%': 0,
811 'google_tv%': '<(google_tv)', 815 'google_tv%': '<(google_tv)',
812 'enable_app_list%': '<(enable_app_list)', 816 'enable_app_list%': '<(enable_app_list)',
813 'use_default_render_theme%': '<(use_default_render_theme)', 817 'use_default_render_theme%': '<(use_default_render_theme)',
814 'enable_settings_app%': '<(enable_settings_app)', 818 'enable_settings_app%': '<(enable_settings_app)',
815 'google_api_key%': '<(google_api_key)', 819 'google_api_key%': '<(google_api_key)',
816 'google_default_client_id%': '<(google_default_client_id)', 820 'google_default_client_id%': '<(google_default_client_id)',
817 'google_default_client_secret%': '<(google_default_client_secret)', 821 'google_default_client_secret%': '<(google_default_client_secret)',
818 'enable_managed_users%': '<(enable_managed_users)', 822 'enable_managed_users%': '<(enable_managed_users)',
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2131 'VCLinkerTool': { 2135 'VCLinkerTool': {
2132 # Make the pdb name sane. Otherwise foo.exe and foo.dll both 2136 # Make the pdb name sane. Otherwise foo.exe and foo.dll both
2133 # have foo.pdb. The ninja generator already defaults to this and 2137 # have foo.pdb. The ninja generator already defaults to this and
2134 # can't handle the $(TargetPath) macro. 2138 # can't handle the $(TargetPath) macro.
2135 'ProgramDatabaseFile': '$(TargetPath).pdb', 2139 'ProgramDatabaseFile': '$(TargetPath).pdb',
2136 } 2140 }
2137 }, 2141 },
2138 }], 2142 }],
2139 ], # win_z7!=0 2143 ], # win_z7!=0
2140 }], # OS==win 2144 }], # OS==win
2145 ['use_system_python_in_tests==1', {
2146 'defines': [
2147 'USE_SYSTEM_PYTHON_IN_TESTS=1',
2148 ],
2149 }],
2141 ['enable_task_manager==1', { 2150 ['enable_task_manager==1', {
2142 'defines': [ 2151 'defines': [
2143 'ENABLE_TASK_MANAGER=1', 2152 'ENABLE_TASK_MANAGER=1',
2144 ], 2153 ],
2145 }], 2154 }],
2146 ['enable_extensions==1', { 2155 ['enable_extensions==1', {
2147 'defines': [ 2156 'defines': [
2148 'ENABLE_EXTENSIONS=1', 2157 'ENABLE_EXTENSIONS=1',
2149 ], 2158 ],
2150 }], 2159 }],
(...skipping 2362 matching lines...) Expand 10 before | Expand all | Expand 10 after
4513 # settings in target dicts. SYMROOT is a special case, because many other 4522 # settings in target dicts. SYMROOT is a special case, because many other
4514 # Xcode variables depend on it, including variables such as 4523 # Xcode variables depend on it, including variables such as
4515 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4524 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4516 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4525 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4517 # files to appear (when present) in the UI as actual files and not red 4526 # files to appear (when present) in the UI as actual files and not red
4518 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4527 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4519 # and therefore SYMROOT, needs to be set at the project level. 4528 # and therefore SYMROOT, needs to be set at the project level.
4520 'SYMROOT': '<(DEPTH)/xcodebuild', 4529 'SYMROOT': '<(DEPTH)/xcodebuild',
4521 }, 4530 },
4522 } 4531 }
OLDNEW
« no previous file with comments | « no previous file | net/test/python_utils.cc » ('j') | net/test/python_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698