Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps

accessible/src/atk/Makefile.in

@@ -2,7 +2,6 @@
 # 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/.
 
-EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK

accessible/src/atk/moz.build

@@ -46,3 +46,4 @@ LOCAL_INCLUDES += [
     '/other-licenses/atk-1.0',
 ]
 
+FINAL_LIBRARY = 'xul'

accessible/src/base/moz.build

@@ -95,3 +95,5 @@ else:
     LOCAL_INCLUDES += [
         '../other',
     ]
+
+FINAL_LIBRARY = 'xul'

accessible/src/generic/moz.build

@@ -56,3 +56,5 @@ else:
     LOCAL_INCLUDES += [
         '../other',
     ]
+
+FINAL_LIBRARY = 'xul'

accessible/src/html/moz.build

@@ -47,3 +47,5 @@ else:
     LOCAL_INCLUDES += [
         '../other',
     ]
+
+FINAL_LIBRARY = 'xul'

accessible/src/mac/Makefile.in

@@ -2,7 +2,6 @@
 # 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/.
 
-EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
 ifneq ($(A11Y_LOG),0)

accessible/src/mac/moz.build

@@ -43,3 +43,4 @@ LOCAL_INCLUDES += [
     '/widget/xpwidgets',
 ]
 
+FINAL_LIBRARY = 'xul'

accessible/src/other/Makefile.in

@@ -2,7 +2,6 @@
 # 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/.
 
-EXPORT_LIBRARY = ..
 include $(topsrcdir)/config/rules.mk
 
 ifneq ($(A11Y_LOG),0)

accessible/src/other/moz.build

@@ -27,3 +27,4 @@ LOCAL_INCLUDES += [
     '../xul',
 ]
 
+FINAL_LIBRARY = 'xul'

accessible/src/windows/ia2/moz.build

@@ -45,5 +45,4 @@ LOCAL_INCLUDES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
 
-EXPORT_LIBRARY = True
-
+FINAL_LIBRARY = 'xul'

accessible/src/windows/msaa/moz.build

@@ -59,7 +59,6 @@ LOCAL_INCLUDES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
 
-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'xul'

accessible/src/windows/sdn/moz.build

@@ -29,5 +29,4 @@ DEFINES['NOMINMAX'] = True
 
 LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
 
-EXPORT_LIBRARY = True
-
+FINAL_LIBRARY = 'xul'

accessible/src/windows/uia/Makefile.in

@@ -2,8 +2,6 @@
 # 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/.
 
-EXPORT_LIBRARY = ..
-
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX

accessible/src/windows/uia/moz.build

@@ -23,3 +23,4 @@ LOCAL_INCLUDES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_uia_s'
 
+FINAL_LIBRARY = 'xul'

accessible/src/xpcom/moz.build

@@ -48,3 +48,5 @@ else:
     LOCAL_INCLUDES += [
         '../other',
     ]
+
+FINAL_LIBRARY = 'xul'

accessible/src/xul/moz.build

@@ -52,3 +52,5 @@ else:
     LOCAL_INCLUDES += [
         '../other',
     ]
+
+FINAL_LIBRARY = 'xul'

browser/components/about/moz.build

@@ -17,3 +17,5 @@ SOURCES += [
 LIBRARY_NAME = 'browserabout_s'
 
 FORCE_STATIC_LIB = True
+
+FINAL_LIBRARY = 'browsercomps'

browser/components/build/Makefile.in

@@ -21,16 +21,6 @@ ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,version)
 endif
 
-SHARED_LIBRARY_LIBS = \
-	../feeds/src/$(LIB_PREFIX)browser_feeds_s.$(LIB_SUFFIX) \
-	../about/$(LIB_PREFIX)browserabout_s.$(LIB_SUFFIX) \
-	../dirprovider/$(LIB_PREFIX)browserdir_s.$(LIB_SUFFIX) \
-	$(NULL)
-
-ifneq (,$(filter windows cocoa gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
-SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
-endif
-
 EXTRA_DSO_LDOPTS += \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
@@ -42,7 +32,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_JS_LIBS)
 endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../migration/src
-SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
 
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 # GTK2: Need to link with glib for GNOME shell service

browser/components/dirprovider/moz.build

@@ -21,3 +21,5 @@ XPCSHELL_TESTS_MANIFESTS += [
 ]
 
 FORCE_STATIC_LIB = True
+
+FINAL_LIBRARY = 'browsercomps'

browser/components/feeds/src/moz.build

@@ -23,3 +23,5 @@ EXTRA_PP_COMPONENTS += [
 LIBRARY_NAME = 'browser_feeds_s'
 
 FORCE_STATIC_LIB = True
+
+FINAL_LIBRARY = 'browsercomps'

browser/components/migration/src/moz.build

@@ -43,3 +43,5 @@ EXTRA_PP_JS_MODULES += [
 ]
 
 FORCE_STATIC_LIB = True
+
+FINAL_LIBRARY = 'browsercomps'

browser/components/shell/src/moz.build

@@ -28,3 +28,5 @@ EXTRA_COMPONENTS += [
 ]
 
 FORCE_STATIC_LIB = True
+
+FINAL_LIBRARY = 'browsercomps'

caps/src/moz.build

@@ -28,3 +28,5 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/js/xpconnect/src',
 ]
+
+FINAL_LIBRARY = 'gklayout'

chrome/src/moz.build

@@ -25,3 +25,4 @@ LIBRARY_NAME = 'chrome_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'xpcom_core'

configure.in

@@ -6129,7 +6129,6 @@ if test -n "$MOZ_TREE_FREETYPE"; then
    CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
    FT2_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)'
    CAIRO_FT_OSLIBS=''
-   CAIRO_FT_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)'
    AC_DEFINE(HAVE_FT_BITMAP_SIZE_Y_PPEM)
    AC_DEFINE(HAVE_FT_GLYPHSLOT_EMBOLDEN)
    AC_DEFINE(HAVE_FT_LOAD_SFNT_TABLE)
@@ -7954,7 +7953,6 @@ if test "$MOZ_TREE_CAIRO"; then
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include"
         CAIRO_FT_OSLIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg"
-        CAIRO_FT_LIBS=""
         ;;
     esac
     if test "$USE_FC_FREETYPE"; then
@@ -7987,7 +7985,6 @@ if test "$MOZ_TREE_CAIRO"; then
     AC_SUBST(QT_SURFACE_FEATURE)
     AC_SUBST(TEE_SURFACE_FEATURE)
 
-    MOZ_CAIRO_LIBS='$(call EXPAND_LIBNAME_PATH,mozcairo,$(DEPTH)/gfx/cairo/cairo/src)'" $CAIRO_FT_LIBS"
     MOZ_CAIRO_OSLIBS='${CAIRO_FT_OSLIBS}'
 
     if test "$MOZ_X11"; then
@@ -8014,36 +8011,10 @@ AC_SUBST(MOZ_CAIRO_LIBS)
 AC_SUBST(MOZ_CAIRO_OSLIBS)
 AC_SUBST(MOZ_TREE_PIXMAN)
 
-dnl ========================================================
-dnl qcms
-dnl ========================================================
-
-QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
-AC_SUBST(QCMS_LIBS)
-
-dnl ========================================================
-dnl HarfBuzz
-dnl ========================================================
-MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
-AC_SUBST(MOZ_HARFBUZZ_LIBS)
-
-dnl ========================================================
-dnl SIL Graphite
-dnl ========================================================
-MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
-AC_SUBST(MOZ_GRAPHITE_LIBS)
-
-dnl ========================================================
-dnl OTS
-dnl ========================================================
-MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
-AC_SUBST(MOZ_OTS_LIBS)
-
 dnl ========================================================
 dnl Skia 
 dnl ========================================================
 if test "$MOZ_ENABLE_SKIA"; then
-  MOZ_SKIA_LIBS='$(DEPTH)/gfx/skia/$(LIB_PREFIX)skia.$(LIB_SUFFIX)'
   AC_DEFINE(MOZ_ENABLE_SKIA)
   AC_DEFINE(USE_SKIA)
   if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
@@ -8058,11 +8029,8 @@ if test "$MOZ_ENABLE_SKIA"; then
     AC_DEFINE(USE_SKIA_GPU)
     AC_SUBST(MOZ_ENABLE_SKIA_GPU)
   fi
-else
-  MOZ_SKIA_LIBS=
 fi
 AC_SUBST(MOZ_ENABLE_SKIA)
-AC_SUBST(MOZ_SKIA_LIBS)
 
 dnl ========================================================
 dnl disable xul

content/base/src/moz.build

@@ -187,6 +187,7 @@ LIBRARY_NAME = 'gkconbase_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/events/src',

content/canvas/src/moz.build

@@ -91,6 +91,7 @@ LIBRARY_NAME = 'gkconcvs_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',

content/events/src/moz.build

@@ -77,6 +77,7 @@ LIBRARY_NAME = 'gkconevents_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',

content/html/content/src/moz.build

@@ -166,6 +166,7 @@ LIBRARY_NAME = 'gkconhtmlcon_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',

content/html/document/src/moz.build

@@ -42,3 +42,5 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/xpcom/ds',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/mathml/content/src/moz.build

@@ -19,6 +19,7 @@ LIBRARY_NAME = 'gkcontentmathml_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]

content/media/apple/moz.build

@@ -22,3 +22,4 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'

content/media/directshow/moz.build

@@ -40,6 +40,7 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkcondirectshow_s'
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
 ]

content/media/encoder/moz.build

@@ -29,3 +29,4 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'

content/media/gstreamer/moz.build

@@ -27,6 +27,7 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',

content/media/mediasource/moz.build

@@ -34,3 +34,4 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconmediasource_s'
 
+FINAL_LIBRARY = 'gklayout'

content/media/moz.build

@@ -158,6 +158,7 @@ LIBRARY_NAME = 'gkconmedia_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/layout/generic',

content/media/ogg/moz.build

@@ -26,3 +26,4 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'

content/media/omx/mediaresourcemanager/moz.build

@@ -19,3 +19,5 @@ LIBRARY_NAME = 'mediaresourcemanager'
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FORCE_STATIC_LIB = True
+
+FINAL_LIBRARY = 'gklayout'

content/media/omx/moz.build

@@ -34,6 +34,7 @@ LIBRARY_NAME = 'gkconomx_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',

content/media/plugins/moz.build

@@ -29,3 +29,5 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     ]
+
+FINAL_LIBRARY = 'gklayout'

content/media/raw/moz.build

@@ -27,3 +27,5 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/media/wave/moz.build

@@ -22,3 +22,4 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'

content/media/webaudio/blink/moz.build

@@ -32,6 +32,7 @@ LIBRARY_NAME = 'gkconwebaudio_blink_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/media/webaudio',
 ]

content/media/webaudio/moz.build

@@ -92,3 +92,4 @@ LIBRARY_NAME = 'gkconwebaudio_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'

content/media/webm/moz.build

@@ -23,3 +23,4 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'

content/media/webrtc/moz.build

@@ -47,5 +47,6 @@ LIBRARY_NAME = 'gkconwebrtc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['NOMINMAX'] = True

content/media/webspeech/recognition/moz.build

@@ -49,3 +49,5 @@ LOCAL_INCLUDES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'gklayout'

content/media/webspeech/synth/moz.build

@@ -52,10 +52,9 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebspeechsynth_s'
 
-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     'ipc',
 ]

content/media/webspeech/synth/pico/moz.build

@@ -13,7 +13,7 @@ SOURCES += [
 
 LIBRARY_NAME = 'synthpico'
 LIBXUL_LIBRARY = True
-EXPORT_LIBRARY = True
 FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'

content/media/wmf/moz.build

@@ -28,3 +28,4 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+FINAL_LIBRARY = 'gklayout'

content/smil/moz.build

@@ -72,3 +72,5 @@ LOCAL_INCLUDES += [
     '../events/src',
     '/layout/style',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/svg/content/src/moz.build

@@ -253,6 +253,7 @@ LIBRARY_NAME = 'gkcontentsvg_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',

content/svg/document/src/moz.build

@@ -29,3 +29,5 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/xpcom/ds',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xbl/src/moz.build

@@ -55,3 +55,5 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/xpcom/ds',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xml/content/src/moz.build

@@ -28,6 +28,7 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]

content/xml/document/src/moz.build

@@ -35,3 +35,5 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/xpcom/ds',
     ]
+
+FINAL_LIBRARY = 'gklayout'

content/xslt/src/base/moz.build

@@ -26,3 +26,5 @@ LOCAL_INCLUDES += [
     '../xpath',
     '../xslt',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xslt/src/xml/moz.build

@@ -23,3 +23,5 @@ LOCAL_INCLUDES += [
     '../xslt',
     '/content/base/src',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xslt/src/xpath/moz.build

@@ -62,3 +62,5 @@ LOCAL_INCLUDES += [
     '../xml',
     '../xslt',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xslt/src/xslt/moz.build

@@ -59,3 +59,5 @@ LOCAL_INCLUDES += [
     '../xpath',
     '/content/base/src',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xul/content/src/moz.build

@@ -33,3 +33,5 @@ LOCAL_INCLUDES += [
     '/layout/xul/base/src',
     '/xpcom/ds',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xul/document/src/moz.build

@@ -41,3 +41,5 @@ LOCAL_INCLUDES += [
     '/layout/xul/base/src',
     '/xpcom/ds',
 ]
+
+FINAL_LIBRARY = 'gklayout'

content/xul/templates/src/moz.build

@@ -47,3 +47,5 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/layout/xul/tree/',
 ]
+
+FINAL_LIBRARY = 'gklayout'

docshell/base/moz.build

@@ -72,6 +72,7 @@ LIBRARY_NAME = 'basedocshell_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../shistory/src',
     '/content/base/src',

docshell/build/moz.build

@@ -28,3 +28,5 @@ LOCAL_INCLUDES += [
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
     LOCAL_INCLUDES += ['/uriloader/exthandler/mac']
+
+FINAL_LIBRARY = 'xul'

docshell/shistory/src/moz.build

@@ -28,3 +28,5 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '/docshell/base',
 ]
+
+FINAL_LIBRARY = 'xul'

dom/activities/src/moz.build

@@ -37,3 +37,5 @@ LIBRARY_NAME = 'dom_activities_s'
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
+
+FINAL_LIBRARY = 'gklayout'

dom/alarm/moz.build

@@ -41,3 +41,4 @@ LIBRARY_NAME = 'domalarm_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'

dom/apps/src/moz.build

@@ -44,6 +44,8 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_apps_s'
 
+FINAL_LIBRARY = 'gklayout'
+
 LOCAL_INCLUDES += [
     '/js/xpconnect/wrappers',
 ]

dom/audiochannel/moz.build

@@ -33,7 +33,6 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domaudiochannel_s'
 
-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'

dom/base/moz.build

@@ -150,6 +150,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
+
 LOCAL_INCLUDES += [
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',

dom/battery/moz.build

@@ -23,6 +23,7 @@ LIBRARY_NAME = 'dom_battery_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]

dom/bindings/moz.build

@@ -41,8 +41,6 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'dombindings_s'
 
-EXPORT_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
@@ -82,3 +80,5 @@ if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
     LOCAL_INCLUDES += [
         '/dom/system/gonk',
     ]
+
+FINAL_LIBRARY = 'xul'

dom/bluetooth/moz.build

@@ -68,6 +68,8 @@ if CONFIG['MOZ_B2G_BT']:
             'bluez/linux',
         ]
 
+    FINAL_LIBRARY = 'gklayout'
+
 EXPORTS.mozilla.dom.bluetooth.ipc += [
     'ipc/BluetoothMessageUtils.h',
 ]

dom/browser-element/moz.build

@@ -41,6 +41,8 @@ LOCAL_INCLUDES += [
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
+
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/',

dom/camera/moz.build

@@ -58,3 +58,5 @@ LOCAL_INCLUDES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'gklayout'

dom/cellbroadcast/src/moz.build

@@ -20,3 +20,4 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'dom_cellbroadcast_s'
 
+FINAL_LIBRARY = 'gklayout'

dom/devicestorage/moz.build

@@ -38,6 +38,7 @@ LIBRARY_NAME = 'domdevicestorage_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',

dom/encoding/moz.build

@@ -28,6 +28,7 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domencoding_s'
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/intl/locale/src',
 ]

dom/file/moz.build

@@ -64,3 +64,5 @@ LIBRARY_NAME = 'domfile_s'
 LOCAL_INCLUDES += [
     '../base',
 ]
+
+FINAL_LIBRARY = 'gklayout'

dom/fmradio/ipc/moz.build

@@ -29,6 +29,8 @@ LOCAL_INCLUDES += [
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
+
 LOCAL_INCLUDES += [
     '/dom/fmradio',
 ]

dom/fmradio/moz.build

@@ -26,6 +26,8 @@ if CONFIG['MOZ_B2G_FM']:
 
     LIBRARY_NAME = 'domfmradio_s'
 
+    FINAL_LIBRARY = 'gklayout'
+
 IPDL_SOURCES += [
     'ipc/PFMRadio.ipdl',
     'ipc/PFMRadioRequest.ipdl',

dom/gamepad/moz.build

@@ -24,6 +24,7 @@ LIBRARY_NAME = 'domgamepad_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/base',
 ]

dom/icc/src/moz.build

@@ -20,6 +20,7 @@ LIBRARY_NAME = 'dom_icc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]

dom/indexedDB/ipc/moz.build

@@ -40,6 +40,7 @@ MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/indexedDB',

dom/indexedDB/moz.build

@@ -70,6 +70,7 @@ LIBRARY_NAME = 'dom_indexeddb_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',

dom/interfaces/devicestorage/moz.build

@@ -16,4 +16,3 @@ MODULE = 'dom'
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domdevicestorage_s'
-

dom/ipc/moz.build

@@ -77,10 +77,9 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domipc_s'
 
-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src/base',
     '../src/geolocation',

dom/media/bridge/moz.build

@@ -29,5 +29,4 @@ LIBRARY_NAME = 'peerconnection'
 
 LIBXUL_LIBRARY = True
 
-EXPORT_LIBRARY = True
-
+FINAL_LIBRARY = 'xul'

dom/media/moz.build

@@ -62,3 +62,5 @@ LOCAL_INCLUDES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'gklayout'

dom/mobilemessage/src/moz.build

@@ -80,3 +80,5 @@ LOCAL_INCLUDES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'gklayout'

dom/network/src/moz.build

@@ -73,6 +73,7 @@ LIBRARY_NAME = 'dom_network_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]

dom/nfc/moz.build

@@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True
 LIBRARY_NAME = 'dom_nfc_s'
 
 LIBXUL_LIBRARY = True
+
+FINAL_LIBRARY = 'gklayout'

dom/plugins/base/android/moz.build

@@ -31,10 +31,9 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkpluginandroid_s'
 
-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/plugins/base',
     '/dom/plugins/base/android/include',

dom/plugins/base/moz.build

@@ -101,8 +101,6 @@ MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkplugin'
 
-EXPORT_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
@@ -129,3 +127,4 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
 
+FINAL_LIBRARY = 'xul'

dom/plugins/ipc/moz.build

@@ -118,10 +118,9 @@ LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domplugins_s'
 
-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '/xpcom/base/',

dom/power/moz.build

@@ -38,3 +38,4 @@ LIBRARY_NAME = 'dom_power_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'

dom/promise/moz.build

@@ -29,3 +29,5 @@ LOCAL_INCLUDES += [
     '../base',
     '../workers',
 ]
+
+FINAL_LIBRARY = 'gklayout'

dom/quota/moz.build

@@ -50,6 +50,7 @@ LIBRARY_NAME = 'domquota_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
 ]