summaryrefslogtreecommitdiff
path: root/toolkit/library
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-25 19:45:39 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-02-25 19:45:39 -0500
commit35c26c6c19e66fabcb230fb074e76e243df04d2b (patch)
tree9cbdb0397c76a7477cd60c53347ab33d426f2019 /toolkit/library
parent8f35c37a9e82ea3e99780c1a001641227a00b6a9 (diff)
downloaduxp-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.gz
Issue #1053 - Remove android support from toolkit
Note: Does not remove support completely from toolkit/mozapps/installer or from telemetry or AppConstants.jsm
Diffstat (limited to 'toolkit/library')
-rw-r--r--toolkit/library/libxul.mk2
-rw-r--r--toolkit/library/moz.build2
2 files changed, 1 insertions, 3 deletions
diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
index 80f934e60e..d09a3962fd 100644
--- a/toolkit/library/libxul.mk
+++ b/toolkit/library/libxul.mk
@@ -5,7 +5,6 @@
EXTRA_DEPS += $(topsrcdir)/toolkit/library/libxul.mk
ifeq (Linux,$(OS_ARCH))
-ifneq (Android,$(OS_TARGET))
OS_LDFLAGS += -Wl,-version-script,symverscript
symverscript: $(topsrcdir)/toolkit/library/symverscript.in
@@ -14,7 +13,6 @@ symverscript: $(topsrcdir)/toolkit/library/symverscript.in
EXTRA_DEPS += symverscript
endif
-endif
# Generate GDB pretty printer-autoload files on Linux and Solaris. OSX's GDB is
# too old to support Python pretty-printers; if this changes, we could make
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 3056799f0e..d9b1675475 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -178,7 +178,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
'winspool',
]
-if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
+if CONFIG['OS_ARCH'] == 'Linux':
OS_LIBS += [
'rt',
]