Backed out changeset 148d11a549ce (bug 1369801)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 27 Jul 2017 18:14:23 +0200
changeset 420074 f3d5446919869539d38ff985b30637e2c6dbe877
parent 420073 deca946411a54151072d6d70a8087c00ebe863e5
child 420075 b09d002b40ff37f4e6f96ad8f6aa1e9671e00166
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1369801
milestone56.0a1
backs out148d11a549cedb332f752779ef23d5622f02dba9
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
Backed out changeset 148d11a549ce (bug 1369801) MozReview-Commit-ID: AIvxY8960pa
devtools/install.rdf
devtools/moz.build
devtools/server/bootstrap.js
--- a/devtools/install.rdf
+++ b/devtools/install.rdf
@@ -12,26 +12,17 @@
                em:name="Developer Tools (local version)"
                em:description="Add-on to load DevTools from local sources and easily reload them with Ctrl+Alt+r shortcut"
                em:version="44.0a1"
                em:type="2"
                em:creator="Mozilla">
 
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
-    <!-- Firefox -->
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>44.0a1</em:minVersion>
         <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>
-    <!-- Fennec -->
-    <em:targetApplication>
-      <Description>
-        <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
-        <em:minVersion>44.0a1</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
   </Description>
 </RDF>
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -22,30 +22,20 @@ DIRS += [
 ]
 
 if CONFIG['MOZ_DEVTOOLS'] != 'addon':
     DIRS += [
         'server',
         'shared',
     ]
     FINAL_TARGET_FILES.features['devtools@mozilla.org'] += [
+        'bootstrap.js',
         'install.rdf',
     ]
 
-# For Fennec, provide an empty bootstrap.js that doesn't do anything.
-# DevTools initialization is handled by mobile/android/chrome/content/RemoteDebugger.js
-if CONFIG['MOZ_DEVTOOLS'] == 'server':
-    FINAL_TARGET_FILES.features['devtools@mozilla.org'] += [
-      'server/bootstrap.js',
-    ]
-elif CONFIG['MOZ_DEVTOOLS'] != 'addon':
-    FINAL_TARGET_FILES.features['devtools@mozilla.org'] += [
-      'bootstrap.js',
-    ]
-
 # /browser uses DIST_SUBDIR.  We opt-in to this treatment when building
 # DevTools for the browser to keep the root omni.ja slim for use by external XUL
 # apps.  Mulet also uses this since it includes /browser.
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DIST_SUBDIR = 'browser'
     export('DIST_SUBDIR')
 
 with Files('**'):
deleted file mode 100644
--- a/devtools/server/bootstrap.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 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 http://mozilla.org/MPL/2.0/. */
-
-/* exported startup, shutdown, install, uninstall */
-
-// Fake bootstrap used when shipping only server part of devtools.
-
-"use strict";
-
-function startup(data) {
-}
-
-function shutdown(data, reason) {
-}
-
-function install() {}
-function uninstall() {}