Bug 973393 - Move the LOCAL_INCLUDES in ipc to moz.build; r=glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 18 Feb 2014 02:12:54 -0500
changeset 169237 9db77f0644bd794380a223179c57e5bf25b9872c
parent 169236 5ecd0339a08714213de36fbf07433fc78ea00253
child 169238 f6d37fdcc976b9f649fa39ce065f298731b1d935
push id26239
push usercbook@mozilla.com
push dateTue, 18 Feb 2014 12:56:56 +0000
treeherdermozilla-central@ef3dad336585 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs973393
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 973393 - Move the LOCAL_INCLUDES in ipc to moz.build; r=glandium
ipc/chromium/Makefile.in
ipc/chromium/moz.build
ipc/ipdl/Makefile.in
ipc/ipdl/moz.build
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -5,71 +5,34 @@
 OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
 
 ACDEFINES =
 
 ifndef MOZ_NATIVE_LIBEVENT # {
 vpath %.c \
   $(srcdir)/src/third_party/libevent \
   $(NULL)
-else # } else {
-# message_pump_libevent.cc includes third_party/libevent/event.h,
-# which we put in $(DIST), see export rule below
-LOCAL_INCLUDES += -I$(DIST)
 endif # }
 
 vpath %.cc \
   $(srcdir)/src/base \
   $(srcdir)/src/chrome/common \
   $(NULL)
 
 vpath %.mm \
   $(srcdir)/src/base \
   $(srcdir)/src/chrome/common \
   $(NULL)
 
-# libevent
-
-ifndef MOZ_NATIVE_LIBEVENT # {
-
-ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
-
-LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent
-LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/include
-
-ifeq ($(OS_ARCH),Darwin) # (OS_MACOSX) {
-LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/mac
-
-else # } else {
-
-ifneq (,$(filter-out DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) # (OS_LINUX) {
-ifeq ($(OS_TARGET),Android) # {
-LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/android
-else # } else {
-LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/linux
-endif # }
-
-else # } else (OS_BSD)  {
-
-LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/bsd
-
-endif # }
-
-endif # }
-
-endif # }
-
-endif # }
-
 OS_CXXFLAGS += $(TK_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_NATIVE_LIBEVENT # {
 
 export-preqs = \
-  $(call mkdir_deps,$(DIST)/third_party/libevent) \
+  $(call mkdir_deps,$(CURDIR)/third_party/libevent) \
   $(NULL)
 
 export:: $(export-preqs)
-	echo '#include <event.h>' > $(DIST)/third_party/libevent/event.h
+	echo '#include <event.h>' > $(CURDIR)/third_party/libevent/event.h
 
 endif # }
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -137,16 +137,20 @@ elif not CONFIG['MOZ_NATIVE_LIBEVENT']:
         'src/third_party/libevent/listener.c',
         'src/third_party/libevent/log.c',
         'src/third_party/libevent/poll.c',
         'src/third_party/libevent/select.c',
         'src/third_party/libevent/signal.c',
         'src/third_party/libevent/strlcpy.c',
     ]
     DEFINES['HAVE_CONFIG_H'] = True
+    LOCAL_INCLUDES += [
+        'src/third_party/libevent',
+        'src/third_party/libevent/include',
+    ]
 
 if os_posix:
     SOURCES += [
         'src/base/condition_variable_posix.cc',
         'src/base/debug_util_posix.cc',
         'src/base/event_recorder_stubs.cc',
         'src/base/file_descriptor_shuffle.cc',
         'src/base/file_util_posix.cc',
@@ -198,16 +202,17 @@ if os_macosx:
         'src/base/sys_string_conversions_mac.mm',
         'src/base/worker_pool_mac.mm',
         'src/chrome/common/mach_ipc_mac.mm',
     ]
     if not CONFIG['MOZ_NATIVE_LIBEVENT']:
         UNIFIED_SOURCES += [
             'src/third_party/libevent/kqueue.c',
         ]
+        LOCAL_INCLUDES += ['src/third_party/libevent/mac']
 
 if os_linux:
     SOURCES += [
         'src/base/atomicops_internals_x86_gcc.cc',
         'src/base/base_paths_linux.cc',
         'src/base/idle_timer_none.cc',
         'src/base/process_util_linux.cc',
         'src/base/time_posix.cc',
@@ -226,16 +231,20 @@ if os_linux:
     if not CONFIG['MOZ_NATIVE_LIBEVENT']:
         if CONFIG['OS_TARGET'] != 'Android':
             SOURCES += [
                 'src/third_party/libevent/epoll_sub.c',
             ]
         SOURCES += [
             'src/third_party/libevent/epoll.c',
         ]
+        if CONFIG['OS_TARGET'] == 'Android':
+            LOCAL_INCLUDES += ['src/third_party/libevent/android']
+        else:
+            LOCAL_INCLUDES += ['src/third_party/libevent/linux']
 
 if os_bsd:
     SOURCES += [
         'src/base/atomicops_internals_x86_gcc.cc',
         'src/base/time_posix.cc',
     ]
     if CONFIG['OS_ARCH'] == 'GNU_kFreeBSD':
         SOURCES += [
@@ -255,16 +264,17 @@ if os_bsd:
         ]
         GENERATED_SOURCES += [
             'src/base/moc_message_pump_qt.cc',
         ]
     if not CONFIG['MOZ_NATIVE_LIBEVENT']:
         SOURCES += [
             'src/third_party/libevent/kqueue.c',
         ]
+        LOCAL_INCLUDES += ['src/third_party/libevent/bsd']
 
 if CONFIG['_MSC_VER']:
     SOURCES += [
         'src/base/debug_on_start.cc',
     ]
 
 ost = CONFIG['OS_TEST']
 if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -3,19 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 GARBAGE_DIRS += _ipdlheaders
 GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc)
 
 # This file is generated by the moz.build backend.
 include ipdlsrcs.mk
 
-LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
-
-
 include $(topsrcdir)/config/rules.mk
 
 
 # NB: the IPDL compiler manages .ipdl-->.h/.cpp dependencies itself,
 # which is why we don't have explicit .h/.cpp targets here
 export:: $(ALL_IPDLSRCS)
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) \
--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@@ -7,8 +7,10 @@
 if CONFIG['MOZ_IPDL_TESTS']:
     DIRS += ['test']
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+GENERATED_INCLUDES += ['/ipc/ipdl/_ipdlheaders']