4 files changed, 3 insertions, 25 deletions
diff --git a/chromium/components/nacl/broker/BUILD.gn b/chromium/components/nacl/broker/BUILD.gn
index 7377462909d..c7cf2276624 100644
--- a/chromium/components/nacl/broker/BUILD.gn
+++ b/chromium/components/nacl/broker/BUILD.gn
@@ -26,12 +26,12 @@ source_set("broker") {
     "//components/nacl/common:minimal",
     "//components/nacl/common:switches",
     "//content/public/common:static_switches",
+    "//content/public/common/zygote:buildflags",
     "//ipc",
     "//mojo/public/cpp/platform",
     "//mojo/public/cpp/system",
     "//sandbox",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/zygote:zygote_buildflags",
   ]
 
   if (current_cpu == target_cpu) {
@@ -137,9 +137,9 @@ if (current_cpu == "x86") {
     deps = [
       "//base",
       "//content/public/common:static_switches",
+      "//content/public/common/zygote:buildflags",
       "//sandbox",
       "//services/service_manager/sandbox",
-      "//services/service_manager/zygote:zygote_buildflags",
     ]
   }
 
diff --git a/chromium/components/nacl/browser/BUILD.gn b/chromium/components/nacl/browser/BUILD.gn
index d6f2729da79..f6203780132 100644
--- a/chromium/components/nacl/browser/BUILD.gn
+++ b/chromium/components/nacl/browser/BUILD.gn
@@ -44,7 +44,6 @@ static_library("browser") {
     "//ppapi/host",
     "//ppapi/proxy:ipc",
     "//ppapi/shared_impl",
-    "//services/service_manager/zygote:zygote_buildflags",
   ]
 
   public_deps = [
@@ -64,7 +63,6 @@ static_library("browser") {
       "//components/nacl/loader:nacl_helper_integration",
       "//sandbox/linux:sandbox_services",
       "//sandbox/linux:suid_sandbox_client",
-      "//services/service_manager/zygote",
     ]
 
     if (enable_nacl_nonsfi) {
diff --git a/chromium/components/nacl/features.gni b/chromium/components/nacl/features.gni
index 8fb680e5e3c..bf4f7c8fb02 100644
--- a/chromium/components/nacl/features.gni
+++ b/chromium/components/nacl/features.gni
@@ -25,17 +25,3 @@ declare_args() {
 assert(!(is_win && host_os != "win") || !enable_nacl,
        "NaCl doesn't work in win cross builds, crbug.com/774186")
 assert(!enable_nacl || checkout_nacl)
-
-if (is_mac && enable_nacl && machine_os_build_major >= 19) {
-  print(
-      "********************************************************************************")
-  print(
-      " WARNING: The NaCL SDK is 32-bit only. macOS 10.15+ removed support for 32-bit")
-  print(
-      "          executables. To fix, set enable_nacl=false in args.gn, or downgrade to")
-  print(
-      "          macOS 10.14. For more information, see https://crbug.com/1049832.")
-  print(
-      "********************************************************************************")
-  assert(false, "NaCL SDK is incompatible with host macOS version")
-}
diff --git a/chromium/components/nacl/loader/BUILD.gn b/chromium/components/nacl/loader/BUILD.gn
index 55ff9234de3..3be334791ff 100644
--- a/chromium/components/nacl/loader/BUILD.gn
+++ b/chromium/components/nacl/loader/BUILD.gn
@@ -43,10 +43,6 @@ source_set("minimal") {
     "//sandbox",
     "//services/service_manager/public/cpp",
   ]
-
-  if (is_linux) {
-    deps += [ "//services/service_manager/zygote" ]
-  }
 }
 
 # This exists just to make 'gn check' happy with :minimal and
@@ -56,9 +52,9 @@ source_set("minimal") {
 source_set("minimal_content_dummy") {
   check_includes = false
   sources = [
-    "//content/public/common/common_sandbox_support_linux.h",
     "//content/public/common/main_function_params.h",
     "//content/public/common/sandbox_init.h",
+    "//content/public/common/zygote/sandbox_support_linux.h",
   ]
 
   # Deps required by the above headers.
@@ -128,7 +124,6 @@ if (is_linux) {
       "//mojo/core/embedder",
       "//sandbox/linux:sandbox_services",
       "//services/service_manager/sandbox",
-      "//services/service_manager/zygote",
       "//url/ipc:url_ipc",
     ]
 
@@ -241,7 +236,6 @@ if (is_nacl_nonsfi) {
       "//sandbox/linux:sandbox",
       "//services/service_manager/public/cpp",
       "//services/service_manager/sandbox",
-      "//services/service_manager/zygote:zygote_util",
     ]
   }