Bug 1520177 - Fixed MinGW build's accessibility r=froydnj
authorTom Ritter <tom@mozilla.com>
Fri, 05 Apr 2019 18:14:16 +0000
changeset 468237 675ac787a5d3982388309ab83585858f0aacfb9b
parent 468236 6385b4edd6153640c05ba981c19eda6e5ecad70f
child 468238 8e81194c97ea42470bbf14a846b215101b4b5946
push id35824
push userapavel@mozilla.com
push dateSat, 06 Apr 2019 10:57:50 +0000
treeherdermozilla-central@a765634b9ec2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1520177, 1515982
milestone68.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 1520177 - Fixed MinGW build's accessibility r=froydnj This patch contains three fixes. 1) As in Bug 1515982, we use the constant for RT_MANIFEST instead of the define, which needs winuser.rh to be included 2) We stop exempting the mingw builds from RCINCLUDE in toolkit/library/moz.build which causes us to miss all of the resources in xul.dll 3) We explicitly include IA2Marshal.dll instead of relying on compiler magic to include it for us. Differential Revision: https://phabricator.services.mozilla.com/D26295
accessible/interfaces/ia2/IA2Marshal.rc
toolkit/library/moz.build
toolkit/library/xulrunner.rc
--- a/accessible/interfaces/ia2/IA2Marshal.rc
+++ b/accessible/interfaces/ia2/IA2Marshal.rc
@@ -1,5 +1,6 @@
 /* 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/. */
 
 1 typelib IA2Typelib.tlb
+2 24 IA2Marshal.dll.manifest
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -42,17 +42,17 @@ def Libxul(name, output_category=None):
         DELAYLOAD_DLLS += [
             'api-ms-win-core-winrt-l1-1-0.dll',
             'api-ms-win-core-winrt-string-l1-1-0.dll',
         ]
 
     if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['ACCESSIBILITY']:
         LOCAL_INCLUDES += ['!/accessible/interfaces/gecko/']
 
-    if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 'gcc'):
+    if CONFIG['OS_ARCH'] == 'WINNT':
         LOCAL_INCLUDES += [
             '/widget/windows',
             '/xpcom/base',
         ]
         # config/version.mk says $(srcdir)/$(RCINCLUDE), and this needs to
         # be valid in both toolkit/library and toolkit/library/gtest.
         # Eventually, the make backend would do its own path canonicalization
         # and config/version.mk would lift the $(srcdir)
--- a/toolkit/library/xulrunner.rc
+++ b/toolkit/library/xulrunner.rc
@@ -1,13 +1,13 @@
 /* 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/. */
 
 #include "mozilla-config.h"
 #include "widget.rc"
 #ifdef ACCESSIBILITY
 1 typelib IGeckoCustom.tlb
-64 RT_MANIFEST IAccessible64.manifest
+64 24 IAccessible64.manifest
 #ifndef HAVE_64BIT_BUILD
-32 RT_MANIFEST IAccessible32.manifest
+32 24 IAccessible32.manifest
 #endif
 #endif