diff options
Diffstat (limited to 'toolkit/library')
| -rw-r--r-- | toolkit/library/libxul.mk | 2 | ||||
| -rw-r--r-- | toolkit/library/moz.build | 8 |
2 files changed, 1 insertions, 9 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 85a7351ba..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', ] @@ -195,15 +195,9 @@ if CONFIG['SERVO_TARGET_DIR']: if CONFIG['MOZ_SYSTEM_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] -if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - if CONFIG['MOZ_SYSTEM_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] -if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] |