commit fd5dae395b8aa45c103671462af51aaa98cd8303
author Peter Boström <pbos@webrtc.org> Thu Nov 26 12:54:24 2015 +0100
committer Peter Boström <pbos@webrtc.org> Thu Nov 26 11:54:32 2015 +0000
tree f28063b746782e9f6c3cff57302e0e398652767d
parent 8f9902a0ff2c4673b3e470026017e858f2992838

Build/use constructormagic.h unconditionally.

These macros no longer collide with Chromium since they are prefixed
with RTC_.

BUG=
R=henrikg@webrtc.org

Review URL: https://codereview.webrtc.org/1477013003 .

Cr-Commit-Position: refs/heads/master@{#10801}

webrtc/base/BUILD.gn

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index db76225..6d51003 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -115,6 +115,7 @@
     "byteorder.h",
     "checks.cc",
     "checks.h",
+    "constructormagic.h",
     "criticalsection.cc",
     "criticalsection.h",
     "event.cc",
@@ -162,7 +163,6 @@
     include_dirs = [ "../../webrtc_overrides" ]
   } else {
     sources += [
-      "constructormagic.h",
       "logging.cc",
       "logging.h",
     ]