author Mike Hommey <>
Fri, 05 Apr 2019 02:30:56 +0000
changeset 468491 60669a841a87644ba9b2f4d9f17f225e2eca0980
parent 454538 5f4630838d46dd81dadb13220a4af0da9e23a619
child 472073 e1993a1f09ac53cd1a04fdf6a87f8cad8e44f73e
permissions -rw-r--r--
Bug 1541792 - Replace linker magic with manual component registration. r=froydnj Before bug 938437, we had a rather large and error-prone nsStaticXULComponents.cpp used to register all modules. That was replaced with clever use of the linker, which allowed to avoid the mess that maintaining that file was. Fast forward to now, where after bug 1524687 and other work that preceded it, we have a much smaller number of remaining static xpcom components, registered via this linker hack, and don't expect to add any new ones. The list should eventually go down to zero. Within that context, it seems to be the right time to get rid of the magic, and with it the problems it causes on its own. Some of those components could probably be trivially be converted to static registration via .conf files, but I didn't want to deal with the possible need to increase the number of dummy modules in XPCOMInit.cpp. They can still be converted as a followup. Differential Revision:

/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* 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 */

#include "mozilla/ModuleUtils.h"

#include "nsShellService.h"

#  include "GeckoViewHistory.h"
#  include "nsDocShellCID.h"
#  include "nsAndroidHistory.h"
#  include "mozilla/jni/Utils.h"



nsresult AndroidHistoryConstructor(nsISupports *aOuter, const nsIID &aIID,
                                   void **aResult) {
  if (mozilla::jni::IsFennec()) {
    return nsAndroidHistoryConstructor(aOuter, aIID, aResult);
  return GeckoViewHistoryConstructor(aOuter, aIID, aResult);

static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
    {&knsShellService_CID, false, nullptr, nsShellServiceConstructor},
    {&kNS_ANDROIDHISTORY_CID, false, nullptr, AndroidHistoryConstructor},

static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
    {nsShellService_ContractID, &knsShellService_CID},

extern const mozilla::Module kBrowserModule = {mozilla::Module::kVersion,
                                               kBrowserCIDs, kBrowserContracts};