Bug 1685764 - Switch openh264 mac builds to the macos SDK toolchain task. r=firefox-build-system-reviewers,sheehan,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D104647

taskcluster/ci/openh264-plugin/kind.yml

@@ -91,12 +91,12 @@ jobs:
             script: mozharness/scripts/openh264_build.py
             config:
                 - openh264/macosx64.py
-            tooltool-downloads: internal
         fetches:
             toolchain:
                 - linux64-cctools-port
                 - linux64-clang
                 - linux64-dump-syms
+                - macosx64-sdk-10.11
     macosx64-aarch64/opt:
         attributes:
             build_platform: macosx64-aarch64

testing/mozharness/configs/openh264/macosx64.py

@@ -13,8 +13,6 @@ external_tools_path = os.path.join(
 )
 
 config = {
-    "tooltool_manifest_file": "osx.manifest",
-    "tooltool_cache": "/builds/tooltool_cache",
     "exes": {
         "gittool.py": [os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "python2.7",
@@ -26,13 +24,17 @@ config = {
     "partial_env": {
         "CXXFLAGS": (
             "-target x86_64-apple-darwin "
-            "-isysroot %(abs_work_dir)s/MacOSX10.11.sdk "
-            "-mmacosx-version-min=10.11"
+            "-isysroot {MOZ_FETCHES_DIR}/MacOSX10.11.sdk "
+            "-mmacosx-version-min=10.11".format(
+                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
+            )
         ),
         "LDFLAGS": (
             "-target x86_64-apple-darwin "
-            "-isysroot %(abs_work_dir)s/MacOSX10.11.sdk "
-            "-mmacosx-version-min=10.11"
+            "-isysroot {MOZ_FETCHES_DIR}/MacOSX10.11.sdk "
+            "-mmacosx-version-min=10.11".format(
+                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
+            )
         ),
         "PATH": (
             "{MOZ_FETCHES_DIR}/clang/bin/:{MOZ_FETCHES_DIR}/cctools/bin/:%(PATH)s".format(

testing/mozharness/configs/openh264/tooltool-manifests/osx.manifest

@@ -1,10 +0,0 @@
-[
-  {
-    "size": 34094283,
-    "visibility": "internal",
-    "digest": "8811050fe375bcc566c8b85173d86b8a87aa2148edfed93023735c2de44b66a5a28cbaa1cfd396032447fd803e03f308ed941a200c0e2a1ad9fbe16b5606ee7c",
-    "algorithm": "sha512",
-    "unpack": true,
-    "filename": "MacOSX10.11.sdk.tar.xz"
-  }
-]