sas.dll is not included to Windows 8 SDK. Use one from from Windows 7…

… SDK instead. BUG=134509 TEST=src/remoting.gyp:remoting_host_installation is buildable. Review URL: https://chromiumcodereview.appspot.com/10673011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144507 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Jun 27, 2012 · 740ebed · 740ebed
1 parent bec0f45
commit 740ebed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build/all.gyp b/build/all.gyp
@@ -555,7 +555,7 @@
                   ],
                 }], # internal_pdf
                 ['component != "shared_library" and wix_exists == "True" and \
-                    platformsdk_exists == "True"', {
+                    sas_dll_exists == "True"', {
                   'dependencies': [
                     '../remoting/remoting.gyp:remoting_host_installation',
                     '../remoting/remoting.gyp:remoting_host_installation_unittest',

diff --git 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)',
     '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': [

diff --git a/remoting/candle_and_light.py b/remoting/candle_and_light.py
@@ -25,7 +25,7 @@ def main():
   parser.add_option('--version', dest='version')
   parser.add_option('--product_dir', dest='product_dir')
   parser.add_option('--intermediate_dir', dest='intermediate_dir')
-  parser.add_option('--platformsdk_path', dest='platformsdk_path')
+  parser.add_option('--sas_dll_path', dest='sas_dll_path')
   parser.add_option('-d', dest='define_list', action='append')
   parser.add_option('--input', dest='input')
   parser.add_option('--output', dest='output')
@@ -45,7 +45,7 @@ def main():
       '-dVersion=%(version)s '
       '-dFileSource=%(product_dir)s '
       '-dIconPath=resources/chromoting.ico '
-      '-dSasDllPath=%(platformsdk_path)s/redist/x86/sas.dll '
+      '-dSasDllPath=%(sas_dll_path)s/sas.dll '
       '%(defines)s '
       )
 

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
@@ -679,7 +679,7 @@
     # include all DLLs imported by the installed binaries, so supporting
     # the component build becomes a burden.
     ['OS == "win" and component != "shared_library" and wix_exists == "True" \
-        and platformsdk_exists == "True"', {
+        and sas_dll_exists == "True"', {
       'targets': [
         {
           'target_name': 'remoting_host_installation',
@@ -713,7 +713,7 @@
                 '<(PRODUCT_DIR)/remoting_host_controller.exe',
                 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
                 '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(platformsdk_path)/redist/x86/sas.dll',
+                '<(sas_dll_path)/sas.dll',
                 'resources/chromoting.ico',
                 'candle_and_light.py',
               ],
@@ -727,7 +727,7 @@
                 '--version', '<(version_full)',
                 '--product_dir', '<(PRODUCT_DIR).',
                 '--intermediate_dir', '<(INTERMEDIATE_DIR).',
-                '--platformsdk_path', '<(platformsdk_path)',
+                '--sas_dll_path', '<(sas_dll_path)',
                 '--input', '<(RULE_INPUT_PATH)',
                 '--output', '<@(_outputs)',
                 '<@(_wix_defines)',