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

Side by Side Diff: build/common.gypi

Issue 398173002: Enable x64 Chromoting host and installer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always define sas_dll_path Created 6 years, 5 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 | « no previous file | remoting/host/installer/win/chromoting.wxs » ('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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 # Set to "tsan", "memcheck", or "drmemory" to configure the build to work 547 # Set to "tsan", "memcheck", or "drmemory" to configure the build to work
548 # with one of those tools. 548 # with one of those tools.
549 'build_for_tool%': '', 549 'build_for_tool%': '',
550 550
551 # If no directory is specified then a temporary directory will be used. 551 # If no directory is specified then a temporary directory will be used.
552 'test_isolation_outdir%': '', 552 'test_isolation_outdir%': '',
553 # True if isolate should fail if the isolate files refer to files 553 # True if isolate should fail if the isolate files refer to files
554 # that are missing. 554 # that are missing.
555 'test_isolation_fail_on_missing': 0, 555 'test_isolation_fail_on_missing': 0,
556 556
557 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
558 'wix_path%': '<(DEPTH)/third_party/wix', 557 'wix_path%': '<(DEPTH)/third_party/wix',
559 558
560 # Managed users are enabled by default. 559 # Managed users are enabled by default.
561 'enable_managed_users%': 1, 560 'enable_managed_users%': 1,
562 561
563 # Platform natively supports discardable memory. 562 # Platform natively supports discardable memory.
564 'native_discardable_memory%': 0, 563 'native_discardable_memory%': 0,
565 564
566 # Platform sends memory pressure signals natively. 565 # Platform sends memory pressure signals natively.
567 'native_memory_pressure_signals%': 0, 566 'native_memory_pressure_signals%': 0,
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 'icu_use_data_file_flag%' : 0, 940 'icu_use_data_file_flag%' : 0,
942 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/', 941 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/',
943 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ', 942 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect ',
944 'data_reduction_proxy_warmup_url%': 'http://www.gstatic.com/generate_2 04', 943 'data_reduction_proxy_warmup_url%': 'http://www.gstatic.com/generate_2 04',
945 'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/', 944 'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/',
946 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/', 945 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',
947 }], 946 }],
948 ['OS=="win" or OS=="mac"', { 947 ['OS=="win" or OS=="mac"', {
949 'enable_wifi_bootstrapping%' : 1, 948 'enable_wifi_bootstrapping%' : 1,
950 }], 949 }],
950
951 # Path to sas.dll, which provides the SendSAS function.
952 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx
953 ['target_arch=="x64"', {
954 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
955 }, {
956 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86',
957 }],
951 ], 958 ],
952 959
953 # Set this to 1 to enable use of concatenated impulse responses 960 # Set this to 1 to enable use of concatenated impulse responses
954 # for the HRTF panner in WebAudio. 961 # for the HRTF panner in WebAudio.
955 'use_concatenated_impulse_responses': 1, 962 'use_concatenated_impulse_responses': 1,
956 963
957 # You can set the variable 'use_official_google_api_keys' to 1 964 # You can set the variable 'use_official_google_api_keys' to 1
958 # to use the Google-internal file containing official API keys 965 # to use the Google-internal file containing official API keys
959 # for Google Chrome even in a developer build. Setting this 966 # for Google Chrome even in a developer build. Setting this
960 # variable explicitly to 1 will cause your build to fail if the 967 # variable explicitly to 1 will cause your build to fail if the
(...skipping 4655 matching lines...) Expand 10 before | Expand all | Expand 10 after
5616 # settings in target dicts. SYMROOT is a special case, because many other 5623 # settings in target dicts. SYMROOT is a special case, because many other
5617 # Xcode variables depend on it, including variables such as 5624 # Xcode variables depend on it, including variables such as
5618 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5625 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5619 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5626 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5620 # files to appear (when present) in the UI as actual files and not red 5627 # files to appear (when present) in the UI as actual files and not red
5621 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5628 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5622 # and therefore SYMROOT, needs to be set at the project level. 5629 # and therefore SYMROOT, needs to be set at the project level.
5623 'SYMROOT': '<(DEPTH)/xcodebuild', 5630 'SYMROOT': '<(DEPTH)/xcodebuild',
5624 }, 5631 },
5625 } 5632 }
OLDNEW
« no previous file with comments | « no previous file | remoting/host/installer/win/chromoting.wxs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698