Bug 717975: only expose m-c implementation of navigator.mozApps on b2g : followup [r=jst]
authorFabrice Desré <fabrice@mozilla.com>
Thu, 19 Jan 2012 09:27:40 -0800
changeset 86143 de34e4fefcade8bfbd7f2590fc426ad1cbeb2a8c
parent 86142 043724be277131896b90db0c4c16c489e4436029
child 86144 847feb303673f37913fb3172913ac78135548233
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs717975
milestone12.0a1
Bug 717975: only expose m-c implementation of navigator.mozApps on b2g : followup [r=jst]
browser/installer/removed-files.in
dom/Makefile.in
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -927,16 +927,18 @@ xpicleanup@BIN_SUFFIX@
   components/nsTelephonyWorker.js
   components/Telephony.manifest
   components/Telephony.js
   components/nsWifiWorker.js
   components/nsWifiWorker.manifest
 #endif
   components/txEXSLTRegExFunctions.js
   components/Weave.js
+  components/Webapps.js
+  components/Webapps.manifest
   components/WebContentConverter.js
   defaults/autoconfig/platform.js
   defaults/autoconfig/prefcalls.js
   defaults/pref/firefox-branding.js
   defaults/pref/firefox.js
   defaults/pref/firefox-l10n.js
   defaults/pref/services-sync.js
   defaults/profile/bookmarks.html
@@ -1052,16 +1054,17 @@ xpicleanup@BIN_SUFFIX@
   modules/services-sync/type_records/passwords.js
   modules/services-sync/type_records/prefs.js
   modules/services-sync/type_records/tabs.js
   modules/services-sync/util.js
   modules/stylePanel.jsm
   modules/tabview/AllTabs.jsm
   modules/tabview/groups.jsm
   modules/tabview/utils.jsm
+  modules/Webapps.jsm
   modules/WindowDraggingUtils.jsm
   #ifdef XP_WIN
     modules/WindowsJumpLists.jsm
     modules/WindowsPreviewPerTab.jsm
   #endif
   modules/XPCOMUtils.jsm
   modules/XPIProvider.jsm
   res/contenteditable.css
@@ -1142,16 +1145,17 @@ xpicleanup@BIN_SUFFIX@
   components/content_xslt.xpt
   components/content_xtf.xpt
   components/contentprefs.xpt
   components/cookie.xpt
   components/crashreporter.xpt
   components/directory.xpt
   components/docshell.xpt
   components/dom.xpt
+  components/dom_apps.xpt
   components/dom_base.xpt
 #ifdef MOZ_B2G_RIL
   components/dom_telephony.xpt
   components/dom_wifi.xpt
   components/dom_system_b2g.xpt
 #endif
   components/dom_canvas.xpt
   components/dom_core.xpt
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -61,18 +61,23 @@ DIRS = \
   interfaces/xul \
   interfaces/storage \
   interfaces/json \
   interfaces/offline \
   interfaces/geolocation \
   interfaces/notification \
   interfaces/svg \
   interfaces/smil \
+  $(NULL)
+
+ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
+DIRS += \
   interfaces/apps \
   $(NULL)
+endif
 
 DIRS += \
   base \
   battery \
   sms \
   src \
   locales \
   network \