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

Side by Side Diff: build/common.gypi

Issue 10673011: sas.dll is not included to Windows 8 SDK. Use one from from Windows 7 SDK instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « build/all.gyp ('k') | remoting/candle_and_light.py » ('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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 # be done while the builders are being reconfigured to check out test data 342 # be done while the builders are being reconfigured to check out test data
343 # files. 343 # files.
344 'test_isolation_mode%': 'noop', 344 'test_isolation_mode%': 'noop',
345 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise 345 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise
346 # gyp will remove duplicate flags, causing isolate.py to be confused. 346 # gyp will remove duplicate flags, causing isolate.py to be confused.
347 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate', 347 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate',
348 348
349 # Force rlz to use chrome's networking stack. 349 # Force rlz to use chrome's networking stack.
350 'force_rlz_use_chrome_net%': 1, 350 'force_rlz_use_chrome_net%': 1,
351 351
352 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files', 352 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
353 'wix_path%': '<(DEPTH)/third_party/wix', 353 'wix_path%': '<(DEPTH)/third_party/wix',
354 354
355 'conditions': [ 355 'conditions': [
356 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 356 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
357 # the 'conditions' clause. Initial attempts resulted in chromium and 357 # the 'conditions' clause. Initial attempts resulted in chromium and
358 # webkit disagreeing on its setting. 358 # webkit disagreeing on its setting.
359 ['OS=="mac"', { 359 ['OS=="mac"', {
360 'use_skia%': 1, 360 'use_skia%': 1,
361 }, { 361 }, {
362 'use_skia%': 1, 362 'use_skia%': 1,
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 561 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
562 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 562 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
563 'use_canvas_skia%': '<(use_canvas_skia)', 563 'use_canvas_skia%': '<(use_canvas_skia)',
564 'test_isolation_mode%': '<(test_isolation_mode)', 564 'test_isolation_mode%': '<(test_isolation_mode)',
565 'test_isolation_outdir%': '<(test_isolation_outdir)', 565 'test_isolation_outdir%': '<(test_isolation_outdir)',
566 'enable_automation%': '<(enable_automation)', 566 'enable_automation%': '<(enable_automation)',
567 'enable_printing%': '<(enable_printing)', 567 'enable_printing%': '<(enable_printing)',
568 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 568 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
569 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 569 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
570 'enable_task_manager%': '<(enable_task_manager)', 570 'enable_task_manager%': '<(enable_task_manager)',
571 'platformsdk_path%': '<(platformsdk_path)', 571 'sas_dll_path%': '<(sas_dll_path)',
cpu_(ooo_6.6-7.5) 2012/06/27 02:05:53 scary change, but hopefully nothing explodes.
572 'wix_path%': '<(wix_path)', 572 'wix_path%': '<(wix_path)',
573 'android_upstream_bringup%': '<(android_upstream_bringup)', 573 'android_upstream_bringup%': '<(android_upstream_bringup)',
574 574
575 # Use system yasm instead of bundled one. 575 # Use system yasm instead of bundled one.
576 'use_system_yasm%': 0, 576 'use_system_yasm%': 0,
577 577
578 # Default to enabled PIE; this is important for ASLR but we may need to be 578 # Default to enabled PIE; this is important for ASLR but we may need to be
579 # able to turn it off for various reasons. 579 # able to turn it off for various reasons.
580 'linux_disable_pie%': 0, 580 'linux_disable_pie%': 0,
581 581
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 794
795 # Disable Dart by default. 795 # Disable Dart by default.
796 'enable_dart%': 0, 796 'enable_dart%': 0,
797 797
798 # The desired version of Windows SDK can be set in ~/.gyp/include.gypi. 798 # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
799 'msbuild_toolset%': '', 799 'msbuild_toolset%': '',
800 800
801 # Native Client is enabled by default. 801 # Native Client is enabled by default.
802 'disable_nacl%': 0, 802 'disable_nacl%': 0,
803 803
804 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_ path))', 804 'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
805 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))', 805 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
806 806
807 'conditions': [ 807 'conditions': [
808 ['os_posix==1 and OS!="mac"', { 808 ['os_posix==1 and OS!="mac"', {
809 # This will set gcc_version to XY if you are running gcc X.Y.*. 809 # This will set gcc_version to XY if you are running gcc X.Y.*.
810 # This is used to tweak build flags for gcc 4.4. 810 # This is used to tweak build flags for gcc 4.4.
811 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 811 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
812 # Figure out the python architecture to decide if we build pyauto. 812 # Figure out the python architecture to decide if we build pyauto.
813 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)', 813 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)',
814 'conditions': [ 814 'conditions': [
(...skipping 2321 matching lines...) Expand 10 before | Expand all | Expand 10 after
3136 # settings in target dicts. SYMROOT is a special case, because many other 3136 # settings in target dicts. SYMROOT is a special case, because many other
3137 # Xcode variables depend on it, including variables such as 3137 # Xcode variables depend on it, including variables such as
3138 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3138 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3139 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3139 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3140 # files to appear (when present) in the UI as actual files and not red 3140 # files to appear (when present) in the UI as actual files and not red
3141 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3141 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3142 # and therefore SYMROOT, needs to be set at the project level. 3142 # and therefore SYMROOT, needs to be set at the project level.
3143 'SYMROOT': '<(DEPTH)/xcodebuild', 3143 'SYMROOT': '<(DEPTH)/xcodebuild',
3144 }, 3144 },
3145 } 3145 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | remoting/candle_and_light.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698