Bug 1620075 - Update update-angle.py to emit black-compatible moz.builds. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D96485
2020-11-10 00:42:35 +00:00 · 2020-11-10 00:42:35 +00:00 · 7bf57356fa
--- a/gfx/angle/checkout/out/gen/angle/id/commit.h
+++ b/gfx/angle/checkout/out/gen/angle/id/commit.h
@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "6c72b64f910d"
+#define ANGLE_COMMIT_HASH "cf6c1604e640"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2020-06-15 13:57:21 -0700"
+#define ANGLE_COMMIT_DATE "2020-07-06 21:17:04 -0700"
--- a/gfx/angle/cherry_picks.txt
+++ b/gfx/angle/cherry_picks.txt
@ -1,4 +1,4 @@
-commit 6c72b64f910d0b0f81456bec26ca295c865c04da
+commit cf6c1604e64084b97bc42d271a0abd9abcfc97a8
 Author: Geoff Lang <geofflang@chromium.org>
 Date:   Wed May 13 18:50:51 2020 -0400

--- a/gfx/angle/targets/angle_common/moz.build
+++ b/gfx/angle/targets/angle_common/moz.build
@ -2,33 +2,38 @@

 include("../../moz.build.common")

-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-# DEFINES['NDEBUG'] = True
+# DEFINES["FULL_SAFE_BROWSING"] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -38,112 +43,105 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -191,19 +189,18 @@ if CONFIG["OS_ARCH"] not in ("Darwin", "WINNT"):
    ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/FIXED:NO',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/FIXED:NO",
+#     "/INCREMENTAL:NO",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 Library("angle_common")
--- a/gfx/angle/targets/angle_gpu_info_util/moz.build
+++ b/gfx/angle/targets/angle_gpu_info_util/moz.build
@ -4,33 +4,38 @@ include("../../moz.build.common")

 DEFINES["ANGLE_ENABLE_D3D11"] = True
 DEFINES["ANGLE_ENABLE_D3D9"] = True
-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-# DEFINES['NDEBUG'] = True
+# DEFINES["FULL_SAFE_BROWSING"] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -40,112 +45,105 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -171,19 +169,18 @@ OS_LIBS += [
 ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/FIXED:NO',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/FIXED:NO",
+#     "/INCREMENTAL:NO",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 Library("angle_gpu_info_util")
--- a/gfx/angle/targets/angle_image_util/moz.build
+++ b/gfx/angle/targets/angle_image_util/moz.build
@ -2,33 +2,38 @@

 include("../../moz.build.common")

-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-# DEFINES['NDEBUG'] = True
+# DEFINES["FULL_SAFE_BROWSING"] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -38,112 +43,105 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -162,19 +160,18 @@ DIRS += [
 ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/FIXED:NO',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/FIXED:NO",
+#     "/INCREMENTAL:NO",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 Library("angle_image_util")
--- a/gfx/angle/targets/libEGL/moz.build
+++ b/gfx/angle/targets/libEGL/moz.build
@ -2,42 +2,47 @@

 include("../../moz.build.common")

-# DEFINES['ANGLE_EGL_LIBRARY_NAME'] = '"libEGL"'
+# DEFINES["ANGLE_EGL_LIBRARY_NAME"] = '"libEGL"'
 DEFINES["ANGLE_GLESV2_LIBRARY_NAME"] = '"libGLESv2"'
-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
 DEFINES["ANGLE_USE_EGL_LOADER"] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 DEFINES["EGLAPI"] = ""
 DEFINES["EGL_EGLEXT_PROTOTYPES"] = True
 DEFINES["EGL_EGL_PROTOTYPES"] = "1"
+# DEFINES["FULL_SAFE_BROWSING"] = True
 DEFINES["GL_GLES_PROTOTYPES"] = "1"
 DEFINES["GL_GLEXT_PROTOTYPES"] = True
 DEFINES["LIBEGL_IMPLEMENTATION"] = True
-# DEFINES['NDEBUG'] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -46,112 +51,105 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -199,25 +197,24 @@ OS_LIBS += [
 ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/DYNAMICBASE',
-#    '/FIXED:NO',
-#    '/ignore:4199',
-#    '/ignore:4221',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/MACHINE:X64',
-#    '/NXCOMPAT',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/SUBSYSTEM:CONSOLE,5.02',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/DYNAMICBASE",
+#     "/FIXED:NO",
+#     "/ignore:4199",
+#     "/ignore:4221",
+#     "/INCREMENTAL:NO",
+#     "/MACHINE:X64",
+#     "/NXCOMPAT",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/SUBSYSTEM:CONSOLE,5.02",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 DEFFILE = "../../checkout/src/libEGL/libEGL.def"
--- a/gfx/angle/targets/libGLESv2/moz.build
+++ b/gfx/angle/targets/libGLESv2/moz.build
@ -5,41 +5,46 @@ include("../../moz.build.common")
 DEFINES["ANGLE_CAPTURE_ENABLED"] = "0"
 DEFINES["ANGLE_ENABLE_D3D11"] = True
 DEFINES["ANGLE_ENABLE_D3D9"] = True
-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 DEFINES["EGL_EGLEXT_PROTOTYPES"] = True
 DEFINES["EGL_EGL_PROTOTYPES"] = "1"
+# DEFINES["FULL_SAFE_BROWSING"] = True
 DEFINES["GL_API"] = ""
 DEFINES["GL_APICALL"] = ""
 DEFINES["GL_GLES_PROTOTYPES"] = "1"
 DEFINES["GL_GLEXT_PROTOTYPES"] = True
 DEFINES["LIBANGLE_IMPLEMENTATION"] = True
 DEFINES["LIBGLESV2_IMPLEMENTATION"] = True
-# DEFINES['NDEBUG'] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -49,113 +54,106 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4530',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4530",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -389,26 +387,25 @@ OS_LIBS += [
 ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/DELAYLOAD:d3d9.dll',
-#    '/DYNAMICBASE',
-#    '/FIXED:NO',
-#    '/ignore:4199',
-#    '/ignore:4221',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/MACHINE:X64',
-#    '/NXCOMPAT',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/SUBSYSTEM:CONSOLE,5.02',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/DELAYLOAD:d3d9.dll",
+#     "/DYNAMICBASE",
+#     "/FIXED:NO",
+#     "/ignore:4199",
+#     "/ignore:4221",
+#     "/INCREMENTAL:NO",
+#     "/MACHINE:X64",
+#     "/NXCOMPAT",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/SUBSYSTEM:CONSOLE,5.02",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 DEFFILE = "../../checkout/src/libGLESv2/libGLESv2_autogen.def"
--- a/gfx/angle/targets/preprocessor/moz.build
+++ b/gfx/angle/targets/preprocessor/moz.build
@ -2,33 +2,38 @@

 include("../../moz.build.common")

-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-# DEFINES['NDEBUG'] = True
+# DEFINES["FULL_SAFE_BROWSING"] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -38,112 +43,105 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -169,19 +167,18 @@ DIRS += [
 ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/FIXED:NO',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/FIXED:NO",
+#     "/INCREMENTAL:NO",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 Library("preprocessor")
--- a/gfx/angle/targets/translator/moz.build
+++ b/gfx/angle/targets/translator/moz.build
@ -5,33 +5,38 @@ include("../../moz.build.common")
 DEFINES["ANGLE_ENABLE_ESSL"] = True
 DEFINES["ANGLE_ENABLE_GLSL"] = True
 DEFINES["ANGLE_ENABLE_HLSL"] = True
-# DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-# DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
-DEFINES["CR_CLANG_REVISION"] = '"n332890-c2443155-1"'
+# DEFINES["ANGLE_IS_64_BIT_CPU"] = True
+# DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+# DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["CR_CLANG_REVISION"] = '"357692-1"'
 DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
-# DEFINES['NDEBUG'] = True
+# DEFINES["FULL_SAFE_BROWSING"] = True
+# DEFINES["NDEBUG"] = True
 DEFINES["NOMINMAX"] = True
+# DEFINES["NO_TCMALLOC"] = True
 DEFINES["NTDDI_VERSION"] = "NTDDI_WIN10_RS2"
-# DEFINES['NVALGRIND'] = True
-# DEFINES['PSAPI_VERSION'] = '2'
+# DEFINES["NVALGRIND"] = True
+# DEFINES["PSAPI_VERSION"] = "2"
+# DEFINES["SAFE_BROWSING_CSD"] = True
+# DEFINES["SAFE_BROWSING_DB_LOCAL"] = True
 DEFINES["UNICODE"] = True
-# DEFINES['USE_AURA'] = '1'
-# DEFINES['WIN32'] = True
-# DEFINES['WIN32_LEAN_AND_MEAN'] = True
-# DEFINES['WINAPI_FAMILY'] = 'WINAPI_FAMILY_DESKTOP_APP'
+# DEFINES["USE_AURA"] = "1"
+# DEFINES["WIN32"] = True
+# DEFINES["WIN32_LEAN_AND_MEAN"] = True
+# DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
 DEFINES["WINVER"] = "0x0A00"
 DEFINES["_ATL_NO_OPENGL"] = True
 DEFINES["_CRT_RAND_S"] = True
 DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
 DEFINES["_HAS_EXCEPTIONS"] = "0"
-# DEFINES['_HAS_NODISCARD'] = True
+# DEFINES["_HAS_NODISCARD"] = True
 DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
 DEFINES["_SECURE_ATL"] = True
 DEFINES["_UNICODE"] = True
-# DEFINES['_USING_V110_SDK71_'] = True
-# DEFINES['_WIN32_WINNT'] = '0x0A00'
-# DEFINES['_WINDOWS'] = True
-# DEFINES['__STD_C'] = True
+# DEFINES["_USING_V110_SDK71_"] = True
+# DEFINES["_WIN32_WINNT"] = "0x0A00"
+# DEFINES["_WINDOWS"] = True
+# DEFINES["__STD_C"] = True

 LOCAL_INCLUDES += [
    "../../checkout/include/",
@ -41,113 +46,106 @@ LOCAL_INCLUDES += [
 ]

 # CXXFLAGS += [
-#    '-D__DATE__=',
-#    '-D__TIME__=',
-#    '-D__TIMESTAMP__=',
-#    '-fcolor-diagnostics',
-#    '-fcomplete-member-pointers',
-#    '-fcrash-diagnostics-dir=../tools/clang/crashreports',
-#    '-fdebug-compilation-dir',
-#    '-fmerge-all-constants',
-#    '-fmsc-version=1916',
-#    '-fno-standalone-debug',
-#    '-gcodeview-ghash',
-#    '-instcombine-lower-dbg-declare=0',
-#    '-m64',
-#    '-mllvm',
-#    '-no-canonical-prefixes',
-#    '-Wextra-semi',
-#    '-Wheader-hygiene',
-#    '-Wimplicit-fallthrough',
-#    '-Wno-bitwise-conditional-parentheses',
-#    '-Wno-builtin-assume-aligned-alignment',
-#    '-Wno-builtin-macro-redefined',
-#    '-Wno-c++11-narrowing',
-#    '-Wno-deprecated-copy',
-#    '-Wno-final-dtor-non-final-class',
-#    '-Wno-ignored-pragma-optimize',
-#    '-Wno-implicit-int-float-conversion',
-#    '-Wno-missing-field-initializers',
-#    '-Wno-nonportable-include-path',
-#    '-Wno-sizeof-array-div',
-#    '-Wno-undefined-var-template',
-#    '-Wno-unneeded-internal-declaration',
-#    '-Wno-unused-parameter',
-#    '-Wnon-virtual-dtor',
-#    '-Wstring-conversion',
-#    '-Wtautological-overlap-compare',
-#    '-Wthread-safety',
-#    '-Wunneeded-internal-declaration',
-#    '-Xclang',
-#    '.',
-#    '/bigobj',
-#    '/Brepro',
-#    '/FS',
-#    '/GR-',
-#    '/guard:cf,nochecks',
-#    '/Gw',
-#    '/Gy',
-#    '/MT',
-#    '/O1',
-#    '/Ob2',
-#    '/Oi',
-#    '/Oy-',
-#    '/TP',
-#    '/utf-8',
-#    '/W4',
-#    '/wd4091',
-#    '/wd4100',
-#    '/wd4121',
-#    '/wd4127',
-#    '/wd4200',
-#    '/wd4201',
-#    '/wd4204',
-#    '/wd4221',
-#    '/wd4244',
-#    '/wd4245',
-#    '/wd4251',
-#    '/wd4267',
-#    '/wd4275',
-#    '/wd4305',
-#    '/wd4312',
-#    '/wd4324',
-#    '/wd4351',
-#    '/wd4355',
-#    '/wd4389',
-#    '/wd4456',
-#    '/wd4457',
-#    '/wd4458',
-#    '/wd4459',
-#    '/wd4503',
-#    '/wd4505',
-#    '/wd4510',
-#    '/wd4512',
-#    '/wd4577',
-#    '/wd4589',
-#    '/wd4610',
-#    '/wd4611',
-#    '/wd4661',
-#    '/wd4701',
-#    '/wd4702',
-#    '/wd4703',
-#    '/wd4706',
-#    '/wd4715',
-#    '/wd4718',
-#    '/wd4838',
-#    '/wd4995',
-#    '/wd4996',
-#    '/we4244',
-#    '/we4456',
-#    '/we4458',
-#    '/we4715',
-#    '/we4800',
-#    '/we4838',
-#    '/WX',
-#    '/X',
-#    '/Z7',
-#    '/Zc:inline',
-#    '/Zc:sizedDealloc-',
-#    '/Zc:twoPhase',
+#     "-D__DATE__=",
+#     "-D__TIME__=",
+#     "-D__TIMESTAMP__=",
+#     "-fcolor-diagnostics",
+#     "-fcomplete-member-pointers",
+#     "-fcrash-diagnostics-dir=../tools/clang/crashreports",
+#     "-fdebug-compilation-dir",
+#     "-fmerge-all-constants",
+#     "-fmsc-version=1911",
+#     "-fno-standalone-debug",
+#     "-gcodeview-ghash",
+#     "-instcombine-lower-dbg-declare=0",
+#     "-m64",
+#     "-mllvm",
+#     "-no-canonical-prefixes",
+#     "-Wextra-semi",
+#     "-Wheader-hygiene",
+#     "-Wimplicit-fallthrough",
+#     "-Wno-builtin-macro-redefined",
+#     "-Wno-c++11-narrowing",
+#     "-Wno-ignored-pragma-optimize",
+#     "-Wno-missing-field-initializers",
+#     "-Wno-nonportable-include-path",
+#     "-Wno-undefined-var-template",
+#     "-Wno-unneeded-internal-declaration",
+#     "-Wno-unused-parameter",
+#     "-Wnon-virtual-dtor",
+#     "-Wstring-conversion",
+#     "-Wtautological-overlap-compare",
+#     "-Wthread-safety",
+#     "-Wunneeded-internal-declaration",
+#     "-Xclang",
+#     ".",
+#     "/bigobj",
+#     "/Brepro",
+#     "/FS",
+#     "/GR-",
+#     "/guard:cf,nochecks",
+#     "/Gw",
+#     "/Gy",
+#     "/MT",
+#     "/O1",
+#     "/Ob2",
+#     "/Oi",
+#     "/Oy-",
+#     "/TP",
+#     "/utf-8",
+#     "/W4",
+#     "/wd4091",
+#     "/wd4100",
+#     "/wd4121",
+#     "/wd4127",
+#     "/wd4200",
+#     "/wd4201",
+#     "/wd4204",
+#     "/wd4221",
+#     "/wd4244",
+#     "/wd4245",
+#     "/wd4251",
+#     "/wd4267",
+#     "/wd4275",
+#     "/wd4305",
+#     "/wd4312",
+#     "/wd4324",
+#     "/wd4351",
+#     "/wd4355",
+#     "/wd4389",
+#     "/wd4456",
+#     "/wd4457",
+#     "/wd4458",
+#     "/wd4459",
+#     "/wd4503",
+#     "/wd4505",
+#     "/wd4510",
+#     "/wd4512",
+#     "/wd4577",
+#     "/wd4589",
+#     "/wd4610",
+#     "/wd4611",
+#     "/wd4661",
+#     "/wd4701",
+#     "/wd4702",
+#     "/wd4703",
+#     "/wd4706",
+#     "/wd4715",
+#     "/wd4718",
+#     "/wd4838",
+#     "/wd4995",
+#     "/wd4996",
+#     "/we4244",
+#     "/we4456",
+#     "/we4458",
+#     "/we4715",
+#     "/we4800",
+#     "/we4838",
+#     "/WX",
+#     "/X",
+#     "/Z7",
+#     "/Zc:inline",
+#     "/Zc:sizedDealloc-",
 # ]

 SOURCES += [
@ -288,19 +286,18 @@ DIRS += [
 ]

 # LDFLAGS += [
-#    '--color-diagnostics',
-#    '/DEBUG:GHASH',
-#    '/FIXED:NO',
-#    '/INCREMENTAL:NO',
-#    '/lldignoreenv',
-#    '/OPT:ICF',
-#    '/OPT:NOLLDTAILMERGE',
-#    '/OPT:REF',
-#    '/pdbaltpath:%_PDB%',
-#    '/PDBSourcePath:C:/dev/angle/out',
-#    '/PROFILE',
-#    '/TIMESTAMP:1575176400',
-#    '/WX',
+#     "--color-diagnostics",
+#     "/DEBUG:GHASH",
+#     "/FIXED:NO",
+#     "/INCREMENTAL:NO",
+#     "/OPT:ICF",
+#     "/OPT:NOLLDTAILMERGE",
+#     "/OPT:REF",
+#     "/pdbaltpath:%_PDB%",
+#     "/PDBSourcePath:C:/dev/angle/out",
+#     "/PROFILE",
+#     "/TIMESTAMP:1554613200",
+#     "/WX",
 # ]

 Library("translator")
--- a/gfx/angle/update-angle.py
+++ b/gfx/angle/update-angle.py
@ -65,7 +65,7 @@ OUT_DIR = pathlib.Path("out")
 COMMON_HEADER = [
    "# Generated by update-angle.py",
    "",
-    "include('../../moz.build.common')",
+    'include("../../moz.build.common")',
 ]

 ROOTS = ["//:translator", "//:libEGL", "//:libGLESv2"]
@ -363,7 +363,7 @@ def append_arr(dest, name, vals, indent=0):

    dest.append("{}{} += [".format(" " * 4 * indent, name))
    for x in sortedi(vals):
-        dest.append("{}'{}',".format(" " * 4 * (indent + 1), x))
+        dest.append('{}"{}",'.format(" " * 4 * (indent + 1), x))
    dest.append("{}]".format(" " * 4 * indent))
    dest.append("")
    return
@ -489,13 +489,16 @@ def export_target(target_name) -> Set[str]:
    for x in sorted(set(desc["defines"])):
        try:
            (k, v) = x.split("=", 1)
-            v = f"'{v}'"
+            if v.startswith('"'):
+                v = f"'{v}'"
+            else:
+                v = f'"{v}"'
        except ValueError:
            (k, v) = (x, "True")
        try:
-            line = f"DEFINES['{k}'] = {v}"
+            line = f'DEFINES["{k}"] = {v}'
            if REGISTERED_DEFINES[k] == False:
-                line = "#" + line
+                line = "# " + line
            lines.append(line)
        except KeyError:
            print(f"[{name}] Unrecognized define: {k}")
@ -517,14 +520,14 @@ def export_target(target_name) -> Set[str]:
            continue
        elif e in ["cpp", "cc", "c"]:
            if b.endswith("_win"):
-                config = "CONFIG['OS_ARCH'] == 'WINNT'"
+                config = 'CONFIG["OS_ARCH"] == "WINNT"'
            elif b.endswith("_linux"):
                # Include these on BSDs too.
-                config = "CONFIG['OS_ARCH'] not in ('Darwin', 'WINNT')"
+                config = 'CONFIG["OS_ARCH"] not in ("Darwin", "WINNT")'
            elif b.endswith("_mac"):
-                config = "CONFIG['OS_ARCH'] == 'Darwin'"
+                config = 'CONFIG["OS_ARCH"] == "Darwin"'
            elif b.endswith("_posix"):
-                config = "CONFIG['OS_ARCH'] != 'WINNT'"
+                config = 'CONFIG["OS_ARCH"] != "WINNT"'
            else:
                config = ""  # None can't compare against str.

@ -532,11 +535,11 @@ def export_target(target_name) -> Set[str]:
            continue
        elif e == "rc":
            assert "RCFILE" not in extras, (target_name, extras["RCFILE"], x)
-            extras["RCFILE"] = f"'{x}'"
+            extras["RCFILE"] = f'"{x}"'
            continue
        elif e == "def":
            assert "DEFFILE" not in extras, (target_name, extras["DEFFILE"], x)
-            extras["DEFFILE"] = f"'{x}'"
+            extras["DEFFILE"] = f'"{x}"'
            continue
        else:
            assert False, ("Unhandled ext:", x)
@ -554,7 +557,7 @@ def export_target(target_name) -> Set[str]:
            def_path = "//" + collapse_dotdots(def_path)

            def_rel_path = list(fixup_paths([def_path]))[0]
-            extras["DEFFILE"] = "'{}'".format(def_rel_path)
+            extras["DEFFILE"] = '"{}"'.format(def_rel_path)

    os_libs = list(map(lambda x: x[: -len(".lib")], set(desc.get("libs", []))))

@ -564,7 +567,7 @@ def export_target(target_name) -> Set[str]:

        def comment(x):
            if x:
-                x = "#" + x
+                x = "# " + x
            return x

        lines = map(comment, lines)
@ -597,12 +600,14 @@ def export_target(target_name) -> Set[str]:

    lib_type = desc["type"]
    if lib_type == "shared_library":
-        lines.append(f"GeckoSharedLibrary('{name}', linkage=None)")
+        lines.append(f'GeckoSharedLibrary("{name}", linkage=None)')
    elif lib_type == "static_library":
-        lines.append(f"Library('{name}')")
+        lines.append(f'Library("{name}")')
    else:
        assert False, lib_type

+    lines.append(""); # EOF newline
+
    # Write it out

    mozbuild = target_dir / "moz.build"