From 1b7f123cfb72975733ef198f2febf14f13581485 Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@mozilla.com>
Date: Thu, 23 Aug 2018 07:59:44 -0700
Subject: [PATCH] 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
---
 config/external/moz.build         | 7 ++++++-
 config/external/msgpack/moz.build | 3 ++-
 config/external/prio/moz.build    | 3 ++-
 dom/chrome-webidl/moz.build       | 6 +++++-
 dom/moz.build                     | 6 +++++-
 third_party/moz.build             | 9 +++++----
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/config/external/moz.build b/config/external/moz.build
index 21667e0543f8..adb57939f227 100644
--- a/config/external/moz.build
+++ b/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']
 
diff --git a/config/external/msgpack/moz.build b/config/external/msgpack/moz.build
index 9e9599a8b228..b652115566ea 100644
--- a/config/external/msgpack/moz.build
+++ b/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']
 
diff --git a/config/external/prio/moz.build b/config/external/prio/moz.build
index b8a167496189..8abd1a58ccb7 100644
--- a/config/external/prio/moz.build
+++ b/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']
 
diff --git a/dom/chrome-webidl/moz.build b/dom/chrome-webidl/moz.build
index d7b6b43274b9..980ce0cf1efe 100644
--- a/dom/chrome-webidl/moz.build
+++ b/dom/chrome-webidl/moz.build
@@ -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',
diff --git a/dom/moz.build b/dom/moz.build
index 741a04267558..0d6daa0f17e4 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -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']
 
diff --git a/third_party/moz.build b/third_party/moz.build
index 183f5a2fb3e0..2a560e1b0f76 100644
--- a/third_party/moz.build
+++ b/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')