Commit f8f36f7e authored by Vicamo Yang's avatar Vicamo Yang
Browse files

Bug 920551 - 2.h/2: fix dom/system/gonk/*. r=hsinyi,khuey, a=koi+

parent 2ce6dbef

b2g/app/b2g.js

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ pref("services.push.requestTimeout", 10000); 
pref("services.push.udp.wakeupEnabled", true);



// NetworkStats

#ifdef MOZ_B2G_RIL

#ifdef MOZ_WIDGET_GONK

pref("dom.mozNetworkStats.enabled", true);

pref("dom.webapps.firstRunWithSIM", true);

#endif

b2g/chrome/content/shell.js

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Cu.import("resource://gre/modules/AppsUtils.jsm"); 
Cu.import('resource://gre/modules/UserAgentOverrides.jsm');

Cu.import('resource://gre/modules/Keyboard.jsm');

Cu.import('resource://gre/modules/ErrorPage.jsm');

#ifdef MOZ_B2G_RIL

#ifdef MOZ_WIDGET_GONK

Cu.import('resource://gre/modules/NetworkStatsService.jsm');

#endif
@@ -611,7 +611,7 @@ var shell = { 


    this.sendEvent(window, 'ContentStart');



#ifdef MOZ_B2G_RIL

#ifdef MOZ_WIDGET_GONK

    Cu.import('resource://gre/modules/OperatorApps.jsm');

#endif

b2g/installer/package-manifest.in

+24 −19
Original line number Diff line number Diff line
@@ -164,10 +164,12 @@ 
@BINPATH@/components/dom_audiochannel.xpt

@BINPATH@/components/dom_base.xpt

@BINPATH@/components/dom_system.xpt

#ifdef MOZ_B2G_RIL

@BINPATH@/components/dom_voicemail.xpt

#ifdef MOZ_WIDGET_GONK

@BINPATH@/components/dom_wifi.xpt

@BINPATH@/components/dom_system_gonk.xpt

#endif

#ifdef MOZ_B2G_RIL

@BINPATH@/components/dom_voicemail.xpt

@BINPATH@/components/dom_icc.xpt

@BINPATH@/components/dom_cellbroadcast.xpt

@BINPATH@/components/dom_wappush.xpt
@@ -400,11 +402,31 @@ 
@BINPATH@/components/nsSidebar.manifest

@BINPATH@/components/nsSidebar.js



; WiFi, NetworkManager, NetworkStats

#ifdef MOZ_WIDGET_GONK

@BINPATH@/components/DOMWifiManager.js

@BINPATH@/components/DOMWifiManager.manifest

@BINPATH@/components/NetworkInterfaceListService.js

@BINPATH@/components/NetworkInterfaceListService.manifest

@BINPATH@/components/NetworkManager.js

@BINPATH@/components/NetworkManager.manifest

@BINPATH@/components/NetworkStatsManager.js

@BINPATH@/components/NetworkStatsManager.manifest

@BINPATH@/components/NetworkStatsServiceProxy.js

@BINPATH@/components/NetworkStatsServiceProxy.manifest

@BINPATH@/components/WifiWorker.js

@BINPATH@/components/WifiWorker.manifest

#endif // MOZ_WIDGET_GONK



; RIL

#if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)

@BINPATH@/components/MmsService.js

@BINPATH@/components/MmsService.manifest

@BINPATH@/components/MobileMessageDatabaseService.js

@BINPATH@/components/MobileMessageDatabaseService.manifest

@BINPATH@/components/RadioInterfaceLayer.js

@BINPATH@/components/RadioInterfaceLayer.manifest

@BINPATH@/components/RILContentHelper.js

@BINPATH@/components/TelephonyProvider.js

@BINPATH@/components/TelephonyProvider.manifest

#endif // MOZ_WIDGET_GONK && MOZ_B2G_RIL
@@ -474,23 +496,6 @@ 
@BINPATH@/components/webvtt.xpt

@BINPATH@/components/WebVTT.manifest

@BINPATH@/components/WebVTTParserWrapper.js

#ifdef MOZ_B2G_RIL

@BINPATH@/components/NetworkManager.manifest

@BINPATH@/components/NetworkManager.js

@BINPATH@/components/RadioInterfaceLayer.manifest

@BINPATH@/components/RadioInterfaceLayer.js

@BINPATH@/components/RILContentHelper.js

@BINPATH@/components/WifiWorker.js

@BINPATH@/components/WifiWorker.manifest

@BINPATH@/components/DOMWifiManager.js

@BINPATH@/components/DOMWifiManager.manifest

@BINPATH@/components/NetworkStatsManager.js

@BINPATH@/components/NetworkStatsManager.manifest

@BINPATH@/components/NetworkInterfaceListService.manifest

@BINPATH@/components/NetworkInterfaceListService.js

@BINPATH@/components/NetworkStatsServiceProxy.manifest

@BINPATH@/components/NetworkStatsServiceProxy.js

#endif

#ifdef MOZ_ENABLE_DBUS

@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@

#endif

content/events/src/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_INCLUDES += \ 
             -I$(srcdir)/../../../layout/xul/tree/ \

             $(NULL)



ifdef MOZ_B2G_RIL

ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))

LOCAL_INCLUDES += \

              -I$(srcdir)/../../../dom/wifi \

              $(NULL)

dom/base/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ LOCAL_INCLUDES += [ 
    '/layout/xul/base/src',

]



if CONFIG['MOZ_B2G_RIL']:

if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

    LOCAL_INCLUDES += [

        '../fmradio',

        '../system/gonk',