From 968de08f335cc6b8ac20769cd77d4343af7fbd2e Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Fri, 16 Jun 2017 13:24:27 -0400
Subject: [PATCH] fuchsia: Use new, qualified error names, disable old names.

BUG=731280
R=scottmg@chromium.org

Review-Url: https://codereview.chromium.org/2941283002 .
Cr-Original-Commit-Position: refs/heads/master@{#480089}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5a0405f8f3607547ae3872063a1c50b2c95989b7
---
 config/fuchsia/BUILD.gn | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/fuchsia/BUILD.gn b/config/fuchsia/BUILD.gn
index cf16b6fbd..1c6ba77c6 100644
--- a/config/fuchsia/BUILD.gn
+++ b/config/fuchsia/BUILD.gn
@@ -9,7 +9,14 @@ assert(is_fuchsia)
 assert(is_posix)
 
 config("compiler") {
-  defines = [ "SYSROOT_VERSION=$sysroot_version" ]
+  defines = [
+    # To force full builds after sysroot updates.
+    "SYSROOT_VERSION=$sysroot_version",
+
+    # Don't have include error codes that aren't prefixed with MX_ in
+    # magenta/errors.h, for they collide with ERR_ defines in chrome code.
+    "USE_MX_ERRORS",
+  ]
   cflags = []
   ldflags = []
   if (current_cpu == "arm64") {