Backed out changeset df602a252b66 (bug 1485946) for Linting failure. CLOSED TREE

config/external/moz.build

@@ -8,16 +8,12 @@ external_dirs = []
 
 DIRS += [
     'lgpllibs',
+    'prio',
     'sqlite',
 ]
 if not CONFIG['MOZ_SYSTEM_JPEG']:
     external_dirs += ['media/libjpeg']
 
-if CONFIG['MOZ_LIBPRIO']:
-    DIRS += [
-        'prio',
-    ]
-
 # There's no "native" brotli or woff2 yet, but probably in the future...
 external_dirs += ['modules/brotli']
 external_dirs += ['modules/woff2']

config/external/msgpack/moz.build

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

config/external/prio/moz.build

@@ -4,5 +4,5 @@
 # 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']
+DIRS += ['../../../third_party/prio']
 

dom/bindings/moz.build

@@ -95,11 +95,9 @@ LOCAL_INCLUDES += [
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/peerconnection',
     '/media/webrtc/trunk/',
+    '/third_party/msgpack/include',
 ]
 
-if CONFIG['MOZ_LIBPRIO']:
-    LOCAL_INCLUDES += ['/third_party/msgpack/include']
-
 DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
 

dom/chrome-webidl/moz.build

@@ -44,6 +44,7 @@ WEBIDL_FILES = [
     'MozStorageStatementParams.webidl',
     'MozStorageStatementRow.webidl',
     'PrecompiledScript.webidl',
+    'PrioEncoder.webidl',
     'PromiseDebugging.webidl',
     'StructuredCloneHolder.webidl',
     'WebExtensionContentScript.webidl',
@@ -57,9 +58,3 @@ if CONFIG['MOZ_PLACES']:
         'PlacesEvent.webidl',
         'PlacesObservers.webidl',
     ]
-
-if CONFIG['MOZ_LIBPRIO']:
-    WEBIDL_FILES += [
-        'PrioEncoder.webidl',
-    ]
-

dom/moz.build

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

third_party/moz.build

@@ -10,9 +10,8 @@ with Files('rust/**'):
 with Files('webkit/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
-if CONFIG['MOZ_LIBPRIO']:
-    with Files('prio/**'):
-        BUG_COMPONENT = ('Firefox Build System', 'General')
+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')

toolkit/moz.configure

@@ -1064,16 +1064,3 @@ def launcher(value, target):
 
 set_config('MOZ_LAUNCHER_PROCESS', launcher)
 set_define('MOZ_LAUNCHER_PROCESS', launcher)
-
-# Prio
-# ==============================================================
-@depends(c_compiler)
-def libprio(info):
-    if info:
-      if info.type in ('msvc'):
-        return None
-    else:
-      return True
-
-set_config('MOZ_LIBPRIO', libprio)
-