diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-25 19:45:39 -0500 |
| commit | 35c26c6c19e66fabcb230fb074e76e243df04d2b (patch) | |
| tree | 9cbdb0397c76a7477cd60c53347ab33d426f2019 /toolkit/library | |
| parent | 8f35c37a9e82ea3e99780c1a001641227a00b6a9 (diff) | |
| download | UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.gz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.lz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.tar.xz UXP-35c26c6c19e66fabcb230fb074e76e243df04d2b.zip | |
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.mk | 2 | ||||
| -rw-r--r-- | toolkit/library/moz.build | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk index 80f934e60..d09a3962f 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 3056799f0..d9b167547 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', ] |