From 5c8ea5d84b8d1a4c07898195e2fcb6fc4cf29ffc Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sun, 19 Sep 2021 04:03:41 +0000
Subject: [PATCH] Bug 1731371: Remove REQUIRES_UNIFIED_BUILD declaration from
 layout subdirectories that don't need it. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D126014
---
 layout/base/gtest/moz.build             | 2 --
 layout/build/moz.build                  | 2 --
 layout/inspector/moz.build              | 2 --
 layout/style/test/gtest/moz.build       | 2 --
 layout/tools/layout-debug/src/moz.build | 2 --
 layout/xul/tree/moz.build               | 2 --
 6 files changed, 12 deletions(-)

diff --git a/layout/base/gtest/moz.build b/layout/base/gtest/moz.build
index fd96a563ae72..12943b5fa87f 100644
--- a/layout/base/gtest/moz.build
+++ b/layout/base/gtest/moz.build
@@ -28,5 +28,3 @@ if CONFIG["CC_TYPE"] == "clang":
     CXXFLAGS += ["-Wno-null-dereference"]
 
 FINAL_LIBRARY = "xul-gtest"
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/layout/build/moz.build b/layout/build/moz.build
index f1973418f89b..448a2404a73b 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -77,5 +77,3 @@ FINAL_LIBRARY = "xul"
 
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += ["-Wno-error=shadow"]
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build
index d5eda1efec1f..e129ccce39fa 100644
--- a/layout/inspector/moz.build
+++ b/layout/inspector/moz.build
@@ -38,5 +38,3 @@ LOCAL_INCLUDES += [
     "../style",
     "/dom/base",
 ]
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/layout/style/test/gtest/moz.build b/layout/style/test/gtest/moz.build
index 075f91c15aca..aa3adbc9abc0 100644
--- a/layout/style/test/gtest/moz.build
+++ b/layout/style/test/gtest/moz.build
@@ -22,5 +22,3 @@ GeneratedFile(
 )
 
 FINAL_LIBRARY = "xul-gtest"
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build
index a15f367b727f..37f9389fa36e 100644
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -22,5 +22,3 @@ XPCOM_MANIFESTS += [
 include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index 83de7fc70f0f..bea77dbe2fb0 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -47,5 +47,3 @@ LOCAL_INCLUDES += [
 
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += ["-Wno-error=shadow"]
-
-REQUIRES_UNIFIED_BUILD = True