Bug 1353990 - Stop exporting woff2 headers. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 06 Apr 2017 13:42:27 +0900
changeset 558308 0d8f901e6435157896b92ef6d3c796bf3fbe1653
parent 558307 65a43e3d16e33a99b2c8be6c33dcbb6a8c07031c
child 558309 5c6da13f628878f7ec397b5195c5d09d688bbccf
push id52860
push userbmo:walkingice0204@gmail.com
push dateFri, 07 Apr 2017 13:29:26 +0000
reviewersgps
bugs1353990
milestone55.0a1
Bug 1353990 - Stop exporting woff2 headers. r=gps woff_out.h includes port.h (actually, worse, "./port.h"), and in dist/include, port.h is actually *not* the one from woff2... We've just been lucky it's worked so far.
gfx/ots/src/moz.build
modules/woff2/moz.build
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -53,8 +53,12 @@ FINAL_LIBRARY = 'gkmedias'
 
 DEFINES['PACKAGE_VERSION'] = '"moz"'
 DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'
 
 USE_LIBS += [
     'brotli',
     'woff2',
 ]
+
+LOCAL_INCLUDES += [
+    '/modules/woff2/src',
+]
--- a/modules/woff2/moz.build
+++ b/modules/woff2/moz.build
@@ -2,21 +2,16 @@
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Graphics: Text')
 
-EXPORTS += [
-    'src/woff2_dec.h',
-    'src/woff2_out.h',
-]
-
 UNIFIED_SOURCES += [
     'src/table_tags.cc',
     'src/variable_length.cc',
     'src/woff2_common.cc',
     'src/woff2_dec.cc',
     'src/woff2_out.cc',
 ]