Bug 1288650 - Export mac/nsOSHelperAppService.h instaed of win/nsOSHelperAppService.h on OSX builder. r=mshal
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 28 Jul 2016 13:12:39 +0900
changeset 347030 0bea94bc88114b495b5a380a99cf680c9b6cd5b8
parent 347029 003c650290a078c27d5cd2a495ae7a42ccc41598
child 347031 312322a8f07628db33a3f672d0907e9f5b651790
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1288650
milestone50.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 1288650 - Export mac/nsOSHelperAppService.h instaed of win/nsOSHelperAppService.h on OSX builder. r=mshal MozReview-Commit-ID: LvM3XY0wujz
docshell/build/moz.build
uriloader/exthandler/moz.build
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -15,17 +15,14 @@ SOURCES += [
 LOCAL_INCLUDES += [
     '/docshell/base',
     '/docshell/shistory',
     '/uriloader/base',
     '/uriloader/exthandler',
     '/uriloader/prefetch',
 ]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
-    LOCAL_INCLUDES += ['/uriloader/exthandler/mac']
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['MOZ_DEVTOOLS'] == 'all':
     DEFINES['MOZ_DEVTOOLS_ALL'] = True
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -18,17 +18,17 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'exthandler'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     osdir = 'win'
     LOCAL_INCLUDES += ['win']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    osdir = 'win'
+    osdir = 'mac'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'uikit'):
     osdir = CONFIG['MOZ_WIDGET_TOOLKIT']
 else:
     osdir = 'unix'
 
 EXPORTS += [
     osdir + '/nsOSHelperAppService.h'
 ]