Convert DISABLE_NACL macro to a buildflag header.
This way, DISABLE_NACL isn't defined globally, but only where
it's needed (chrome, some extensions, some content/). This also means
toggling nacl on and off doesn't require rebuilding the world (in
particular, blink. On my linux build, toggling the flag now reruns
697 build steps, compared to 56274 before). It also gets rid of a ton
of confusing `if !DISABLED` double negation.
No intended behavior change.
Bug: none
Change-Id: Iaad97b4590524a15f7be8565d5722cb2b1b81845
Reviewed-on: https://chromium-review.googlesource.com/659241
Reviewed-by: Brett Wilson <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#500971}diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 74de55f2..7e7707b 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -10,6 +10,7 @@
#include "build/build_config.h"
#include "build/buildflag.h"
#include "chrome/common/features.h"
+#include "components/nacl/common/features.h"
#include "device/vr/features/features.h"
#include "media/media_features.h"
@@ -1614,7 +1615,7 @@
#endif // ENABLE_VR
-#if !defined(DISABLE_NACL)
+#if BUILDFLAG(ENABLE_NACL)
extern const char kNaclDebugMaskName[];
extern const char kNaclDebugMaskDescription[];
@@ -1631,7 +1632,7 @@
extern const char kPnaclSubzeroName[];
extern const char kPnaclSubzeroDescription[];
-#endif // !defined(DISABLE_NACL)
+#endif // BUILDFLAG(ENABLE_NACL)
#if BUILDFLAG(ENABLE_WEBRTC)
