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

Unified Diff: build/common.gypi

Issue 398173002: Enable x64 Chromoting host and installer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/installer/win/chromoting.wxs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 93016e2db7d0aff8f5e361f3fcac5223486d14c2..cf5b0cb46cbfe92b115e2f1bf49744591f51eec5 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -554,7 +554,6 @@
# that are missing.
'test_isolation_fail_on_missing': 0,
- 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
'wix_path%': '<(DEPTH)/third_party/wix',
# Managed users are enabled by default.
@@ -948,6 +947,19 @@
['OS=="win" or OS=="mac"', {
'enable_wifi_bootstrapping%' : 1,
}],
+
+ # Path to sas.dll, which provides the SendSAS function.
+ # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs.85).aspx
+ ['OS=="win"', {
+ 'conditions': [
Sergey Ulanov 2014/07/16 19:54:12 Instead of putting condition inside of a condition
dcaiafa 2014/07/16 22:22:57 Done.
+ ['target_arch=="x64"', {
+ 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/amd64',
+ }],
+ ['target_arch=="ia32"', {
+ 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
+ }]
+ ],
+ }],
],
# Set this to 1 to enable use of concatenated impulse responses
« 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