Skip to content

Commit

Permalink
Bug 1041860 - Avoid setting FINAL_LIBRARY to libraries that further u…
Browse files Browse the repository at this point in the history 
…se a FINAL_LIBRARY. r=mshal
  • Loading branch information
@glandium
glandium committed Jul 22, 2014
1 parent 37506aa commit bc5d680
Show file tree
Hide file tree
Showing 234 changed files with 234 additions and 237 deletions.
2 changes: 1 addition & 1 deletion caps/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ LOCAL_INCLUDES += [
'/js/xpconnect/src',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

2 changes: 1 addition & 1 deletion chrome/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ MSVC_ENABLE_PGO = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'xpcom_core'
FINAL_LIBRARY = 'xul'

GENERATED_INCLUDES += [
'/xpcom',
Expand Down
2 changes: 1 addition & 1 deletion content/base/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ MSVC_ENABLE_PGO = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/caps',
'/content/html/content/src',
Expand Down
2 changes: 1 addition & 1 deletion content/canvas/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ MSVC_ENABLE_PGO = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/content/html/content/src',
Expand Down
2 changes: 1 addition & 1 deletion content/html/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ MSVC_ENABLE_PGO = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/content/canvas/src',
Expand Down
2 changes: 1 addition & 1 deletion content/html/document/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ LOCAL_INCLUDES += [
'/layout/style',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/mathml/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
]
Expand Down
2 changes: 1 addition & 1 deletion content/media/android/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ LOCAL_INCLUDES += [
'/content/html/content/src',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/apple/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ UNIFIED_SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

LDFLAGS += ['-framework AudioToolbox']
2 changes: 1 addition & 1 deletion content/media/directshow/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if not CONFIG['MOZ_WEBRTC']:

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/media/webrtc/trunk/webrtc/modules/video_capture/windows',
]
Expand Down
2 changes: 1 addition & 1 deletion content/media/eme/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ UNIFIED_SOURCES += [
'MediaKeySession.cpp',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

FAIL_ON_WARNINGS = True
2 changes: 1 addition & 1 deletion content/media/encoder/fmp4_muxer/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ UNIFIED_SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/encoder/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if CONFIG['MOZ_WEBM_ENCODER']:

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

# These includes are from Android JB, for use of MediaCodec.
LOCAL_INCLUDES += ['/ipc/chromium/src']
Expand Down
2 changes: 1 addition & 1 deletion content/media/fmp4/ffmpeg/libav53/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ LOCAL_INCLUDES += [
'include',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

FAIL_ON_WARNINGS = True
2 changes: 1 addition & 1 deletion content/media/fmp4/ffmpeg/libav54/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ LOCAL_INCLUDES += [
'include',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

FAIL_ON_WARNINGS = True
2 changes: 1 addition & 1 deletion content/media/fmp4/ffmpeg/libav55/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ LOCAL_INCLUDES += [
]
CXXFLAGS += [ '-Wno-deprecated-declarations' ]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

FAIL_ON_WARNINGS = True
2 changes: 1 addition & 1 deletion content/media/fmp4/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ if CONFIG['MOZ_FFMPEG']:
'ffmpeg',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

FAIL_ON_WARNINGS = True
2 changes: 1 addition & 1 deletion content/media/fmp4/wmf/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ UNIFIED_SOURCES += [
'WMFVideoMFTManager.cpp',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

FAIL_ON_WARNINGS = True
2 changes: 1 addition & 1 deletion content/media/gstreamer/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ else:

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/content/html/content/src',
Expand Down
2 changes: 1 addition & 1 deletion content/media/mediasource/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ UNIFIED_SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ MSVC_ENABLE_PGO = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/layout/generic',
Expand Down
2 changes: 1 addition & 1 deletion content/media/ogg/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ UNIFIED_SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/omx/mediaresourcemanager/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ CXXFLAGS += [
]
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/omx/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if CONFIG['ANDROID_VERSION'] >= '16':

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/content/html/content/src',
Expand Down
2 changes: 1 addition & 1 deletion content/media/raw/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ LOCAL_INCLUDES += [
'/content/html/content/src',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/wave/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ UNIFIED_SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/webaudio/blink/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ UNIFIED_SOURCES += [

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/media/webaudio',
]
Expand Down
2 changes: 1 addition & 1 deletion content/media/webaudio/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/webm/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ if CONFIG['MOZ_WEBM_ENCODER']:

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/webrtc/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ EXPORTS.mozilla += [

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
if CONFIG['OS_ARCH'] == 'WINNT':
DEFINES['NOMINMAX'] = True

Expand Down
2 changes: 1 addition & 1 deletion content/media/webspeech/recognition/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ LOCAL_INCLUDES += [

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/webspeech/synth/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'ipc',
]
2 changes: 1 addition & 1 deletion content/media/webspeech/synth/pico/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ UNIFIED_SOURCES += [
FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/media/wmf/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/svg/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/content/html/content/src',
Expand Down
2 changes: 1 addition & 1 deletion content/svg/document/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ LOCAL_INCLUDES += [
'/layout/style',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/xml/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FAIL_ON_WARNINGS = True

MSVC_ENABLE_PGO = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
]
Expand Down
2 changes: 1 addition & 1 deletion content/xml/document/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ LOCAL_INCLUDES += [
'/layout/style',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/xul/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ LOCAL_INCLUDES += [
'/layout/xul',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/xul/document/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ LOCAL_INCLUDES += [
'/layout/xul',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion content/xul/templates/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ LOCAL_INCLUDES += [
'/layout/xul/tree/',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/activities/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ LOCAL_INCLUDES += [
'/dom/base',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/alarm/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/animation/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ SOURCES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/apps/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ EXTRA_PP_JS_MODULES += [

FAIL_ON_WARNINGS = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

LOCAL_INCLUDES += [
'/js/xpconnect/wrappers',
Expand Down
2 changes: 1 addition & 1 deletion dom/archivereader/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ LOCAL_INCLUDES += [
'../base',
]

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/asmjscache/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ MSVC_ENABLE_PGO = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/audiochannel/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/base/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

LOCAL_INCLUDES += [
'/js/xpconnect/src',
Expand Down
2 changes: 1 addition & 1 deletion dom/battery/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ FAIL_ON_WARNINGS = True

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
2 changes: 1 addition & 1 deletion dom/bluetooth/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ if CONFIG['MOZ_B2G_BT']:
DEFINES['MOZ_BLUETOOTH_DBUS'] = True
DEFINES['HAVE_PTHREADS'] = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

LOCAL_INCLUDES += [
'ipc',
Expand Down
2 changes: 1 addition & 1 deletion dom/bluetooth2/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if CONFIG['MOZ_B2G_BT']:
DEFINES['MOZ_BLUETOOTH_DBUS'] = True
DEFINES['HAVE_PTHREADS'] = True

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

LOCAL_INCLUDES += [
'ipc',
Expand Down
2 changes: 1 addition & 1 deletion dom/browser-element/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ LOCAL_INCLUDES += [

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'

LOCAL_INCLUDES += [
'/content/base/src',
Expand Down
2 changes: 1 addition & 1 deletion dom/camera/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ LOCAL_INCLUDES += [

include('/ipc/chromium/chromium-config.mozbuild')

FINAL_LIBRARY = 'gklayout'
FINAL_LIBRARY = 'xul'
Loading

0 comments on commit bc5d680

Please sign in to comment.