Fixed mac builds for 0.37.4

build_ffmpeg.py

@@ -304,6 +304,12 @@ def get_min_deps(deps_str):
           'repo': '/chromium/deps/nasm.git',
           'path': 'src/third_party/nasm',
           'opts':  re.MULTILINE | re.IGNORECASE | re.DOTALL
+      },
+      'xz': {
+          'reg': ur"xz.git.+@'.+'(.+)'",
+          'repo': '/chromium/deps/xz.git',
+          'path': 'src/chrome/installer/mac/third_party/xz/xz',
+          'opts': re.IGNORECASE
       }
     }
     min_deps_list = []
@@ -313,6 +319,20 @@ def get_min_deps(deps_str):
             raise Exception("`%s` is not found in DEPS" % k)
         min_deps_list.append(dep)
 
+    # Not nice but fix for mac
+    min_deps_list.append('''
+      'src/tools/clang/dsymutil': {
+        'packages': [
+          {
+            'package': 'chromium/llvm-build-tools/dsymutil',
+            'version': 'kykIT8m8YzNqqLP2xFGBTuo0ZtU9lom3BwiStWleyWkC',
+          }
+        ],
+        'condition': 'checkout_mac',
+        'dep_type': 'cipd',
+      },
+    ''')
+
     return textwrap.dedent('''
     deps = {
     %s
@@ -359,22 +379,15 @@ def get_min_hooks():
           'checkout_linux and checkout_x64'
       },
       {
-        'action': [
-          'python',
-          'src/build/mac_toolchain.py'
-        ],
-        'pattern':
-          '.',
-        'name':
-          'mac_toolchain',
-        'condition':
-          'checkout_ios or checkout_mac'
+          'name': 'mac_toolchain',
+          'pattern': '.',
+          'condition': 'checkout_ios or checkout_mac',
+          'action': ['python', 'src/build/mac_toolchain.py'],
       },
       {
         'action': [
           'python',
-          'src/tools/clang/scripts/update.py',
-          '--if-needed'
+          'src/tools/clang/scripts/update.py'
         ],
         'pattern':
           '.',
@@ -441,6 +454,30 @@ def get_min_hooks():
         'condition':
           'host_os == "linux"'
       },
+      {
+        'name': 'clang_format_mac',
+        'pattern': '.',
+        'condition': 'host_os == "mac"',
+        'action': [ 'python',
+                    'src/third_party/depot_tools/download_from_google_storage.py',
+                    '--no_resume',
+                    '--no_auth',
+                    '--bucket', 'chromium-clang-format',
+                    '-s', 'src/buildtools/mac/clang-format.sha1',
+        ],
+      },
+      {
+        'name': 'rc_mac',
+        'pattern': '.',
+        'condition': 'checkout_win and host_os == "mac"',
+        'action': [ 'python',
+                    'src/third_party/depot_tools/download_from_google_storage.py',
+                    '--no_resume',
+                    '--no_auth',
+                    '--bucket', 'chromium-browser-clang/rc',
+                    '-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
+        ],
+      },
       {
         'name': 'lastchange',
         'pattern': '.',

guides/build_windows.md

@@ -15,7 +15,7 @@
 	choco install git
 
 #### Install python
-	choco install python
+	choco install python2
 	pip install pywin32
 
 #### Install VisualStudio 2017
@@ -25,7 +25,7 @@ The clang-cl compiler is used but Visual Studio's header files, libraries, and s
 Visual Studio Community Edition should work if its license is appropriate for you.  
 You must install the “**Desktop development with C++**” component and the “**MFC and ATL support***” sub-component.  
 
-> You must have the version **10.0.15063 Windows 10 SDK** installed. This can be installed separately or by checking the appropriate box in the Visual Studio Installer.
+> You must have the version **10.0.17134 Windows 10 SDK** installed. This can be installed separately or by checking the appropriate box in the Visual Studio Installer.
 
 ## Build ffmpeg.dll (WITHOUT proprietary codecs)