Backed out changeset d486edc7499b (bug 1732201) for causing web-platf…

…orm-tests failures on header-totalsfntsize-001.xht CLOSED TREE

.clang-format-ignore

@@ -96,9 +96,7 @@ gfx/angle/.*
 gfx/cairo/.*
 gfx/graphite2/.*
 gfx/harfbuzz/.*
-gfx/ots/src/.*
-gfx/ots/include/.*
-gfx/ots/tests/.*
+gfx/ots/.*
 gfx/qcms/.*
 gfx/sfntly/.*
 gfx/skia/.*
@@ -169,8 +167,7 @@ modules/fdlibm/.*
 modules/freetype2/.*
 modules/libbz2/.*
 modules/pdfium/.*
-modules/woff2/include/.*
-modules/woff2/src/.*
+modules/woff2/.*
 modules/xz-embedded/.*
 modules/zlib/.*
 mozglue/misc/decimal/.*

config/recurse.mk

@@ -217,7 +217,7 @@ endif
 ifdef MOZ_USING_WASM_SANDBOXING
 security/rlbox/target-objects: config/external/wasm2c_sandbox_compiler/host
 security/rlbox/target: security/rlbox/target-objects
-dom/media/ogg/target-objects extensions/spellcheck/hunspell/glue/target-objects gfx/thebes/target-objects parser/expat/target-objects parser/htmlparser/target-objects gfx/ots/src/target-objects: security/rlbox/target-objects
+dom/media/ogg/target-objects extensions/spellcheck/hunspell/glue/target-objects gfx/thebes/target-objects parser/expat/target-objects parser/htmlparser/target-objects: security/rlbox/target-objects
 endif
 
 # Most things are built during compile (target/host), but some things happen during export

gfx/ots/README.mozilla

@@ -10,4 +10,3 @@ Additional files: README.mozilla, src/moz.build
 
 Additional patch: ots-visibility.patch (bug 711079).
 Additional patch: ots-lz4.patch
-Additional patch: ots-rlbox.patch (bug 1732201).