1353990 - Stop exporting the woff2 and brotli headers

Status: RESOLVED FIXED

(Core :: Graphics: Text, defect)

Description

[Mike Hommey [:glandium]]

There aren't enough things using the woff and brotli code to need their headers under dist/include. OTOH, they have similarly (and generically) named headers that conflict with each other. Luckily, it's not apparently currently breaking anything, but that's a bad situation to be in.

To be more specific, woff2_out.h includes port.h. When ots includes that header through woff_dec.h, it picks it up from dist/include, and picks port.h from there too... but port.h in dist/include comes from brotli... and woff has a *different* port.h in modules/woff2/src.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Bug 1353990 - Stop exporting woff2 headers.

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.

Review commit: https://reviewboard.mozilla.org/r/127052/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/127052/

Comment 2

[Mike Hommey [:glandium]]

Attachment: Bug 1353990 - Stop exporting brotli headers.

They have generic names, and are potentially conflicting with
in-tree headers with the same name (which is true for at least port.h).

There aren't enough users of brotli to want to avoid LOCAL_INCLUDES
in the directories that use it.

Review commit: https://reviewboard.mozilla.org/r/127054/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/127054/

Comment 3

[Gregory Szorc [:gps]]

Comment on attachment 8855172 [details]
Bug 1353990 - Stop exporting woff2 headers.

https://reviewboard.mozilla.org/r/127052/#review130116

Comment 4

[Gregory Szorc [:gps]]

Comment on attachment 8855173 [details]
Bug 1353990 - Stop exporting brotli headers.

https://reviewboard.mozilla.org/r/127054/#review130118

This makes me wonder if we should have an allow list of exported headers. Obviously we can always allow mozilla/ files. But that's a topic for another day.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/0d8f901e6435
Stop exporting woff2 headers. r=gps
https://hg.mozilla.org/integration/autoland/rev/5c6da13f6288
Stop exporting brotli headers. r=gps

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/0d8f901e6435
https://hg.mozilla.org/mozilla-central/rev/5c6da13f6288

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/0d8f901e6435
https://hg.mozilla.org/mozilla-central/rev/5c6da13f6288