Bug 939622 - Remove LIBXUL_LIBRARY for intermediate libs that end up in gkmedias. r=gps
What LIBXUL_LIBRARY does is:
- Imply FORCE_STATIC_LIB
- Build with -DIMPL_LIBXUL
- Build with -DMOZILLA_INTERNAL_API
Those intermediate libs that end up in gkmedias and have LIBXUL_LIBRARY defined
in their moz.build are all third party code (or handled like third party code).
Besides FORCE_STATIC_LIB, none of the side effects of LIBXUL_LIBRARY should be
needed.
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -103,17 +103,15 @@ SOURCES += [
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
'MacIOSurface.cpp',
'QuartzSupport.mm',
]
FAIL_ON_WARNINGS = True
-LIBXUL_LIBRARY = True
-
MSVC_ENABLE_PGO = True
LIBRARY_NAME = 'gfx2d'
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -114,15 +114,14 @@ UNIFIED_SOURCES += ['src/compiler/' + sr
'OutputGLSLBase.cpp',
'ShaderLang.cpp',
'TranslatorESSL.cpp',
'TranslatorGLSL.cpp',
'VersionGLSL.cpp',
]]
LIBRARY_NAME = 'angle'
-LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
if CONFIG['OS_TARGET'] == 'WINNT':
NO_VISIBILITY_FLAGS = True
FINAL_LIBRARY = 'gkmedias'
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -109,18 +109,16 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
]
SOURCES += [
'cairo-ft-font.c',
'cairo-type1-subset.c',
]
LIBRARY_NAME = 'mozcairo'
-LIBXUL_LIBRARY = True
-
SOURCES += [
'cairo-analysis-surface.c',
'cairo-arc.c',
'cairo-array.c',
'cairo-atomic.c',
'cairo-base64-stream.c',
'cairo-bentley-ottmann-rectangular.c',
'cairo-bentley-ottmann-rectilinear.c',
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -20,18 +20,16 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CON
'pixman-arm-neon-asm.S',
]
if CONFIG['HAVE_ARM_SIMD']:
SOURCES += [
'pixman-arm-simd-asm-scaled.S',
'pixman-arm-simd-asm.S',
]
-LIBXUL_LIBRARY = True
-
SOURCES += [
'pixman-access-accessors.c',
'pixman-access.c',
'pixman-arm.c',
'pixman-bits-image.c',
'pixman-combine-float.c',
'pixman-combine16.c',
'pixman-combine32.c',
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -1,17 +1,14 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
-if CONFIG['OS_TARGET'] != 'WINNT':
- LIBXUL_LIBRARY = True
-
# This should contain all of the _PUBLIC_HEADERS from files.mk
EXPORTS.graphite2 += [
'../include/graphite2/Font.h',
'../include/graphite2/Log.h',
'../include/graphite2/Segment.h',
'../include/graphite2/Types.h',
]
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -1,17 +1,14 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
-if CONFIG['OS_ARCH'] != 'WINNT':
- LIBXUL_LIBRARY = True
-
EXPORTS.harfbuzz += [
'hb-blob.h',
'hb-buffer.h',
'hb-common.h',
'hb-deprecated.h',
'hb-face.h',
'hb-font.h',
'hb-ot-layout.h',
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -1,17 +1,14 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
-if CONFIG['OS_TARGET'] != 'WINNT':
- LIBXUL_LIBRARY = True
-
EXPORTS += [
'../include/opentype-sanitiser.h',
'../include/ots-memory-stream.h',
]
SOURCES += [
'cff.cc',
'cff_type2_charstring.cc',
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -6,18 +6,16 @@
EXPORTS += [
'qcms.h',
'qcmstypes.h',
]
LIBRARY_NAME = 'mozqcms'
-LIBXUL_LIBRARY = True
-
SOURCES += [
'chain.c',
'iccread.c',
'matrix.c',
'transform.c',
'transform_util.c',
]
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -580,13 +580,11 @@ else:
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
SOURCES += [
'src/opts/memset.arm.S',
]
LIBRARY_NAME = 'skia'
-LIBXUL_LIBRARY = True
-
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'gkmedias'