Bug 1208540 - The toolkit.defaultChromeURI window is opened twice r=jchen
authorFabrice Desré <fabrice@mozilla.com>
Fri, 25 Sep 2015 14:50:56 -0700
changeset 264664 fb57429c568a9e436b702a1ff6fb75bbf3dbf4e7
parent 264663 126cadcfd9871fe589a4fe22e5f416020c0e8d75
child 264665 f1423787daddf4e65c17ef22321e6ad9df82800d
push id65707
push usercbook@mozilla.com
push dateMon, 28 Sep 2015 12:18:34 +0000
treeherdermozilla-inbound@2c0e60a8f736 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjchen
bugs1208540
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1208540 - The toolkit.defaultChromeURI window is opened twice r=jchen
mobile/android/b2gdroid/installer/package-manifest.in
toolkit/components/moz.build
--- a/mobile/android/b2gdroid/installer/package-manifest.in
+++ b/mobile/android/b2gdroid/installer/package-manifest.in
@@ -371,18 +371,16 @@
 @BINPATH@/components/nsSessionStore.manifest
 @BINPATH@/components/nsSessionStartup.js
 @BINPATH@/components/nsSessionStore.js
 @BINPATH@/components/nsURLFormatter.manifest
 @BINPATH@/components/nsURLFormatter.js
 @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
 @BINPATH@/components/txEXSLTRegExFunctions.manifest
 @BINPATH@/components/txEXSLTRegExFunctions.js
-@BINPATH@/components/nsDefaultCLH.manifest
-@BINPATH@/components/nsDefaultCLH.js
 @BINPATH@/components/nsContentPrefService.manifest
 @BINPATH@/components/nsContentPrefService.js
 @BINPATH@/components/nsContentDispatchChooser.manifest
 @BINPATH@/components/nsContentDispatchChooser.js
 @BINPATH@/components/nsHandlerService.manifest
 @BINPATH@/components/nsHandlerService.js
 @BINPATH@/components/nsWebHandlerApp.manifest
 @BINPATH@/components/nsWebHandlerApp.js
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -98,12 +98,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk
 if CONFIG['NIGHTLY_BUILD']: # Bug 1136927 - Performance Monitoring is not ready for prime-time yet
     DIRS += [
       'aboutperformance',
       'perfmonitoring',
     ]
 
 DIRS += ['build']
 
-EXTRA_COMPONENTS += [
-    'nsDefaultCLH.js',
-    'nsDefaultCLH.manifest',
-]
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+    EXTRA_COMPONENTS += [
+        'nsDefaultCLH.js',
+        'nsDefaultCLH.manifest',
+    ]