Bug 1497741 - Remove source exception in gfx/graphite2/src/moz.build r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 10 Oct 2018 14:57:13 +0000
changeset 496365 9697308cfe0008833329e2c20851854c0ff8a113
parent 496364 3dcdff5c8b38cddf416c3a062c48c1619b119a6f
child 496366 4e4d1fe0d17ed328d5ace7f27686f2e4af480ecf
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1497741, 1272647, 1245076
milestone64.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 1497741 - Remove source exception in gfx/graphite2/src/moz.build r=froydnj This effectively backs out bug 1272647, which was not necessary in the first place: the underlying issue had been fixed in bug 1245076, but the bug reporter had reported against version 45, while bug 1245076 was fixed in version 48. As a matter of fact, the reporter of bug 1272647 acknowledged in bug 1245076 that bug 1245076 fixed the issue. Differential Revision: https://phabricator.services.mozilla.com/D8179
gfx/graphite2/src/moz.build
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -38,32 +38,27 @@ UNIFIED_SOURCES += [
     'gr_features.cpp',
     'gr_font.cpp',
     'gr_logging.cpp',
     'gr_segment.cpp',
     'gr_slot.cpp',
     'Intervals.cpp',
     'json.cpp',
     'Justifier.cpp',
+    'NameTable.cpp',
     'Pass.cpp',
     'Position.cpp',
     'Segment.cpp',
     'Silf.cpp',
     'Slot.cpp',
     'Sparse.cpp',
     'TtfUtil.cpp',
     'UtfCodec.cpp',
 ]
 
-# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it,
-# see bug 1272647.
-SOURCES += [
-    'NameTable.cpp',
-]
-
 # tell graphite2 not to export symbols, we'll be linking it directly with
 # thebes
 DEFINES['GRAPHITE2_STATIC'] = True
 
 # We allow warnings for third-party code that can be updated from upstream.
 AllowCompilerWarnings()
 
 FINAL_LIBRARY = 'gkmedias'