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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | remoting/candle_and_light.py » ('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 169de9ac8cfd69bc55b3a141f60d316e6c6bf7b2..d928ca7d702269e184740775acdbb3e9c66b341a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -349,7 +349,7 @@
# Force rlz to use chrome's networking stack.
'force_rlz_use_chrome_net%': 1,
- 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files',
+ 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
'wix_path%': '<(DEPTH)/third_party/wix',
'conditions': [
@@ -568,7 +568,7 @@
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
'enable_task_manager%': '<(enable_task_manager)',
- 'platformsdk_path%': '<(platformsdk_path)',
+ 'sas_dll_path%': '<(sas_dll_path)',
cpu_(ooo_6.6-7.5) 2012/06/27 02:05:53 scary change, but hopefully nothing explodes.
'wix_path%': '<(wix_path)',
'android_upstream_bringup%': '<(android_upstream_bringup)',
@@ -801,7 +801,7 @@
# Native Client is enabled by default.
'disable_nacl%': 0,
- 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_path))',
+ 'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
'conditions': [
« 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