Bug 1146888 - Build more files in ipc/chromium in unified mode; r=bent
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 24 Mar 2015 09:37:51 -0400
changeset 264311 04e9afe5d6d81b0c2eee5fd337dadaac83e86a9f
parent 264310 cba35d1eae6a408719b25eecba491e676a01dd1e
child 264312 319a40f0fce42c89b21518db7530b29ad359ac51
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent
bugs1146888
milestone39.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 1146888 - Build more files in ipc/chromium in unified mode; r=bent
ipc/chromium/moz.build
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -97,46 +97,49 @@ if os_win:
         'src/base/waitable_event_watcher_win.cc',
         'src/base/waitable_event_win.cc',
         'src/base/win_util.cc',
         'src/chrome/common/ipc_channel_win.cc',
         'src/chrome/common/process_watcher_win.cc',
         'src/chrome/common/transport_dib_win.cc',
     ]
 elif not CONFIG['MOZ_NATIVE_LIBEVENT']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'src/third_party/libevent/buffer.c',
         'src/third_party/libevent/bufferevent.c',
         'src/third_party/libevent/bufferevent_ratelim.c',
         'src/third_party/libevent/bufferevent_sock.c',
-        'src/third_party/libevent/evdns.c',
         'src/third_party/libevent/event.c',
         'src/third_party/libevent/event_tagging.c',
         'src/third_party/libevent/evmap.c',
         'src/third_party/libevent/evrpc.c',
         'src/third_party/libevent/evthread.c',
         'src/third_party/libevent/evthread_pthread.c',
         'src/third_party/libevent/evutil.c',
         'src/third_party/libevent/evutil_rand.c',
         'src/third_party/libevent/http.c',
         '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',
     ]
+    SOURCES += [
+        # This file cannot be built in unified mode because of strtotimeval symbol clash.
+        'src/third_party/libevent/evdns.c',
+    ]
     DEFINES['HAVE_CONFIG_H'] = True
     LOCAL_INCLUDES += [
         'src/third_party/libevent',
         'src/third_party/libevent/include',
     ]
 
 if os_posix:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'src/base/condition_variable_posix.cc',
         'src/base/file_descriptor_shuffle.cc',
         'src/base/file_util_posix.cc',
         'src/base/lock_impl_posix.cc',
         'src/base/message_pump_libevent.cc',
         'src/base/platform_file_posix.cc',
         'src/base/platform_thread_posix.cc',
         'src/base/process_posix.cc',
@@ -149,40 +152,41 @@ if os_posix:
         'src/base/thread_local_storage_posix.cc',
         'src/base/waitable_event_posix.cc',
         'src/base/waitable_event_watcher_posix.cc',
         'src/chrome/common/file_descriptor_set_posix.cc',
         'src/chrome/common/ipc_channel_posix.cc',
         'src/chrome/common/process_watcher_posix_sigchld.cc',
     ]
     if CONFIG['OS_TARGET'] == 'Android':
-        SOURCES += [
+        UNIFIED_SOURCES += [
             'src/base/message_pump_android.cc',
         ]
         DEFINES['ANDROID'] = True
         DEFINES['_POSIX_MONOTONIC_CLOCK'] = 0
 
 if os_macosx:
     UNIFIED_SOURCES += [
+        'src/base/chrome_application_mac.mm',
+        'src/base/file_util_mac.mm',
         'src/base/idle_timer.cc',
+        'src/base/mac_util.mm',
+        'src/base/message_pump_mac.mm',
+        'src/base/process_util_mac.mm',
+        'src/base/scoped_nsautorelease_pool.mm',
         'src/base/sys_info_mac.cc',
+        'src/base/sys_string_conversions_mac.mm',
         'src/base/time_mac.cc',
+        'src/chrome/common/mach_ipc_mac.mm',
         'src/chrome/common/mach_message_source_mac.cc',
         'src/chrome/common/transport_dib_mac.cc',
     ]
     SOURCES += [
-        'src/base/chrome_application_mac.mm',
-        'src/base/file_util_mac.mm',
-        'src/base/mac_util.mm',
-        'src/base/message_pump_mac.mm',
+        # This file cannot be built in unified mode because of the redefinition of NoOp.
         'src/base/platform_thread_mac.mm',
-        'src/base/process_util_mac.mm',
-        'src/base/scoped_nsautorelease_pool.mm',
-        'src/base/sys_string_conversions_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: