From 288258a78dc4a4b4a4036feb160a1100a73c93f9 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Tue, 10 Nov 2015 05:51:44 -0500
Subject: [PATCH] bug 1223529 - remove ipc/chromium/Makefile.in. r=gps

--HG--
extra : commitid : H9gHRycMIGd
extra : rebase_source : 0f96f1f1eb9ddea4ba1310637d6ff36312fc3030
---
 ipc/chromium/Makefile.in                      | 40 -------------------
 ipc/chromium/moz.build                        |  2 +
 .../src/base/message_pump_libevent.cc         |  2 +-
 3 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 ipc/chromium/Makefile.in

diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
deleted file mode 100644
index d79cb4f9cebd..000000000000
--- a/ipc/chromium/Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
-
-ACDEFINES =
-
-ifndef MOZ_NATIVE_LIBEVENT # {
-vpath %.c \
-  $(srcdir)/src/third_party/libevent \
-  $(NULL)
-endif # }
-
-vpath %.cc \
-  $(srcdir)/src/base \
-  $(srcdir)/src/chrome/common \
-  $(NULL)
-
-vpath %.mm \
-  $(srcdir)/src/base \
-  $(srcdir)/src/chrome/common \
-  $(NULL)
-
-OS_CXXFLAGS += $(TK_CFLAGS)
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_NATIVE_LIBEVENT # {
-
-export-preqs = \
-  $(call mkdir_deps,$(CURDIR)/third_party/libevent) \
-  $(NULL)
-
-export:: $(DIST)/third_party/libevent/event.h
-
-$(DIST)/third_party/libevent/event.h:: $(export-preqs)
-	echo '#include <event.h>' > $(CURDIR)/third_party/libevent/event.h
-
-endif # }
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build
index d6a27e4c6620..8b8e4ccc1fb8 100644
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -167,6 +167,8 @@ if '86' not in ost and 'arm' not in ost and 'mips' not in ost:
         'src/base/atomicops_internals_mutex.cc',
     ]
 
+CXXFLAGS += CONFIG['TK_CFLAGS']
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
index c3486752c3e7..9ce230c4a5ec 100644
--- a/ipc/chromium/src/base/message_pump_libevent.cc
+++ b/ipc/chromium/src/base/message_pump_libevent.cc
@@ -15,7 +15,7 @@
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/time.h"
 #include "nsDependentSubstring.h"
-#include "third_party/libevent/event.h"
+#include "event.h"
 #include "mozilla/UniquePtr.h"
 
 // This macro checks that the _EVENT_SIZEOF_* constants defined in