From d20ca24a070d547be3bce4d513ef151b6be5f955 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 25 Feb 2020 19:45:39 -0500
Subject: Issue #1053 - Remove android support from toolkit

Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
---
 toolkit/components/moz.build | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'toolkit/components/moz.build')

diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index ab759366c..ff71d7c9d 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -66,11 +66,10 @@ DIRS += [
 
 DIRS += ['mozintl']
 
-if not CONFIG['MOZ_FENNEC']:
-    DIRS += ['narrate', 'viewsource'];
+DIRS += ['narrate', 'viewsource'];
 
-    if CONFIG['NS_PRINTING']:
-        DIRS += ['printing']
+if CONFIG['NS_PRINTING']:
+    DIRS += ['printing']
 
 if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']
@@ -94,13 +93,11 @@ if CONFIG['MOZ_URL_CLASSIFIER']:
 
 DIRS += ['captivedetect']
 
-if CONFIG['OS_TARGET'] != 'Android':
-    DIRS += ['terminator']
+DIRS += ['terminator']
 
 DIRS += ['build']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
-    EXTRA_COMPONENTS += [
-        'nsDefaultCLH.js',
-        'nsDefaultCLH.manifest',
-    ]
+EXTRA_COMPONENTS += [
+    'nsDefaultCLH.js',
+    'nsDefaultCLH.manifest',
+]
-- 
cgit v1.2.3