Bug 1353990 - Stop exporting brotli headers. r=gps

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.

--HG--
extra : rebase_source : 82531ac5961ad80e1b3d0c1484a2f146be194411
This commit is contained in:
Mike Hommey 2017-04-06 13:44:47 +09:00
parent a1829611bc
commit d6aaa996f4
5 changed files with 7 additions and 9 deletions

View File

@ -45,4 +45,5 @@ LOCAL_INCLUDES += [
'../style',
'/dom/base',
'/dom/xbl',
'/modules/brotli/dec',
]

View File

@ -7,15 +7,6 @@
with Files('**'):
BUG_COMPONENT = ('Core', 'General')
EXPORTS += [
'dec/bit_reader.h',
'dec/decode.h',
'dec/huffman.h',
'dec/port.h',
'dec/state.h',
'dec/types.h',
]
UNIFIED_SOURCES += [
'dec/bit_reader.c',
'dec/decode.c',

View File

@ -15,6 +15,10 @@ UNIFIED_SOURCES += [
'src/woff2_out.cc',
]
LOCAL_INCLUDES += [
'/modules/brotli/dec',
]
# We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True

View File

@ -69,4 +69,5 @@ if CONFIG['MOZ_RTSP']:
LOCAL_INCLUDES += [
'!/netwerk/dns',
'/modules/brotli/dec',
]

View File

@ -35,5 +35,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/modules/brotli/dec',
'/netwerk/base',
]