Bug 1421501 - disable PrioEncoder on Android until libprio supports it r=froydnj
☠☠ backed out by 6d71f0af2bcc ☠ ☠
authorRobert Helmer <rhelmer@mozilla.com>
Thu, 23 Aug 2018 07:59:44 -0700
changeset 488259 492f05d220b1495339691c2bf6c74c106a89b867
parent 488258 844232d77d0d8696d580663a5c9e3e8398aa93f6
child 488260 15a645ce3c645ca39165d1402395db305d0fccc7
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1421501
milestone63.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 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
config/external/moz.build
config/external/msgpack/moz.build
config/external/prio/moz.build
dom/chrome-webidl/moz.build
dom/moz.build
third_party/moz.build
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -3,19 +3,24 @@
 # 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/.
 
 external_dirs = []
 
 DIRS += [
     'lgpllibs',
-    'prio',
     'sqlite',
 ]
+
+if CONFIG['OS_TARGET'] != 'Android':
+    DIRS += [
+        'prio',
+    ]
+
 if not CONFIG['MOZ_SYSTEM_JPEG']:
     external_dirs += ['media/libjpeg']
 
 # There's no "native" brotli or woff2 yet, but probably in the future...
 external_dirs += ['modules/brotli']
 external_dirs += ['modules/woff2']
 
 external_dirs += ['modules/xz-embedded']
--- a/config/external/msgpack/moz.build
+++ b/config/external/msgpack/moz.build
@@ -1,8 +1,9 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-DIRS += ['/third_party/msgpack']
+if CONFIG['OS_TARGET'] != 'Android':
+    DIRS += ['/third_party/msgpack']
 
--- a/config/external/prio/moz.build
+++ b/config/external/prio/moz.build
@@ -1,8 +1,9 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-DIRS += ['../../../third_party/prio']
+if CONFIG['OS_TARGET'] != 'Android':
+    DIRS += ['/third_party/prio']
 
--- a/dom/chrome-webidl/moz.build
+++ b/dom/chrome-webidl/moz.build
@@ -38,22 +38,26 @@ WEBIDL_FILES = [
     'MatchPattern.webidl',
     'MessageManager.webidl',
     'MozDocumentObserver.webidl',
     'MozSharedMap.webidl',
     'MozStorageAsyncStatementParams.webidl',
     'MozStorageStatementParams.webidl',
     'MozStorageStatementRow.webidl',
     'PrecompiledScript.webidl',
-    'PrioEncoder.webidl',
     'PromiseDebugging.webidl',
     'StructuredCloneHolder.webidl',
     'WebExtensionContentScript.webidl',
     'WebExtensionPolicy.webidl',
     'XULFrameElement.webidl',
     'XULScrollElement.webidl'
 ]
 
+if CONFIG['OS_TARGET'] != 'Android':
+    WEBIDL_FILES += [
+        'PrioEncoder.webidl',
+    ]
+
 if CONFIG['MOZ_PLACES']:
     WEBIDL_FILES += [
         'PlacesEvent.webidl',
         'PlacesObservers.webidl',
     ]
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -58,17 +58,16 @@ DIRS += [
     'jsurl',
     'asmjscache',
     'mathml',
     'media',
     'midi',
     'notification',
     'offline',
     'power',
-    'prio',
     'push',
     'quota',
     'security',
     'storage',
     'svg',
     'locales',
     'network',
     'permission',
@@ -100,16 +99,21 @@ DIRS += [
     'worklet',
     'script',
     'payments',
     'websocket',
     'serviceworkers',
     'simpledb',
 ]
 
+if CONFIG['OS_TARGET'] != 'Android':
+    DIRS += [
+        'prio',
+    ]
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['plugins/ipc/hangui']
 
 DIRS += ['presentation']
 
 TEST_DIRS += [
     'tests',
     'imptests',
--- a/third_party/moz.build
+++ b/third_party/moz.build
@@ -5,13 +5,14 @@ with Files('aom/**'):
     BUG_COMPONENT = ('Core', 'Audio/Video: Playback')
 
 with Files('rust/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 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')