bug 1223529 - remove ipc/chromium/Makefile.in. r=gps
authorTed Mielczarek <ted@mielczarek.org>
Tue, 10 Nov 2015 05:51:44 -0500
changeset 308257 887c67fc1fc8129ac62fcddca6e6bb7664d3162d
parent 308256 d339cb421ae36ad613277c9432416b6e5d4c92d6
child 308258 378ce498787cdb763ea354e3e0cc541e4a4ca813
child 308401 9e35954842c8b973878677d0c780fb5f77bcbc31
child 308507 d87ef90f333685605e28c92d3c1b6eaad903b303
child 308990 89ce9655e1fac472b698257a0491fc6a7320ca0f
push id7450
push userahalberstadt@mozilla.com
push dateWed, 11 Nov 2015 20:09:05 +0000
reviewersgps
bugs1223529
milestone45.0a1
bug 1223529 - remove ipc/chromium/Makefile.in. r=gps
ipc/chromium/Makefile.in
ipc/chromium/moz.build
ipc/chromium/src/base/message_pump_libevent.cc
deleted file mode 100644
--- 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 # }
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -162,11 +162,13 @@ if os_bsd or os_linux:
         ]
 
 ost = CONFIG['OS_TEST']
 if '86' not in ost and 'arm' not in ost and 'mips' not in ost:
     SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]
 
+CXXFLAGS += CONFIG['TK_CFLAGS']
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/chromium/src/base/message_pump_libevent.cc
+++ b/ipc/chromium/src/base/message_pump_libevent.cc
@@ -10,17 +10,17 @@
 #include <unistd.h>
 #endif
 
 #include "eintr_wrapper.h"
 #include "base/logging.h"
 #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
 // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
 #define CHECK_EVENT_SIZEOF(TYPE, type) \
     static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
     "bad _EVENT_SIZEOF_"#TYPE);