Chromium Code Reviews| 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 |