Bug 1421501 - disable PrioEncoder on Android until libprio supports it r=froydnj

This is tracked upstream at https://github.com/mozilla/libprio/issues/15

MozReview-Commit-ID: L5VWKdEitfB

--HG--
extra : rebase_source : c19472a8658c01a2edc69904e36a2c5409af1396
This commit is contained in:
Robert Helmer 2018-08-23 07:59:44 -07:00
Родитель fff0e34b0f
Коммит 1b7f123cfb
6 изменённых файлов: 25 добавлений и 9 удалений

7
config/external/moz.build поставляемый
Просмотреть файл

@ -8,9 +8,14 @@ external_dirs = []
DIRS += [
'lgpllibs',
'prio',
'sqlite',
]
if CONFIG['OS_TARGET'] != 'Android':
DIRS += [
'prio',
]
if not CONFIG['MOZ_SYSTEM_JPEG']:
external_dirs += ['media/libjpeg']

3
config/external/msgpack/moz.build поставляемый
Просмотреть файл

@ -4,5 +4,6 @@
# 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/.
DIRS += ['/third_party/msgpack']
if CONFIG['OS_TARGET'] != 'Android':
DIRS += ['/third_party/msgpack']

3
config/external/prio/moz.build поставляемый
Просмотреть файл

@ -4,5 +4,6 @@
# 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/.
DIRS += ['../../../third_party/prio']
if CONFIG['OS_TARGET'] != 'Android':
DIRS += ['/third_party/prio']

Просмотреть файл

@ -43,7 +43,6 @@ WEBIDL_FILES = [
'MozStorageStatementParams.webidl',
'MozStorageStatementRow.webidl',
'PrecompiledScript.webidl',
'PrioEncoder.webidl',
'PromiseDebugging.webidl',
'StructuredCloneHolder.webidl',
'WebExtensionContentScript.webidl',
@ -52,6 +51,11 @@ WEBIDL_FILES = [
'XULScrollElement.webidl'
]
if CONFIG['OS_TARGET'] != 'Android':
WEBIDL_FILES += [
'PrioEncoder.webidl',
]
if CONFIG['MOZ_PLACES']:
WEBIDL_FILES += [
'PlacesEvent.webidl',

Просмотреть файл

@ -63,7 +63,6 @@ DIRS += [
'notification',
'offline',
'power',
'prio',
'push',
'quota',
'security',
@ -105,6 +104,11 @@ DIRS += [
'simpledb',
]
if CONFIG['OS_TARGET'] != 'Android':
DIRS += [
'prio',
]
if CONFIG['OS_ARCH'] == 'WINNT':
DIRS += ['plugins/ipc/hangui']

9
third_party/moz.build поставляемый
Просмотреть файл

@ -10,8 +10,9 @@ with Files('rust/**'):
with Files('webkit/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')
with Files('prio/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')
if CONFIG['OS_TARGET'] != 'Android':
with Files('prio/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')
with Files('msgpack/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')
with Files('msgpack/**'):
BUG_COMPONENT = ('Firefox Build System', 'General')