Revert "Issue #1676 - Part 5: Split devtools sources out of js/src/moz.build"

This reverts commit 24b835f0a92881903c6e5f0cebb7ffa93c5e9d05.

js/src/devtools/moz.build

@@ -1,25 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-include('../js-config.mozbuild')
-include('../js-cxxflags.mozbuild')
-
-FINAL_LIBRARY = "js"
-
-# Includes should be relative to parent path
-LOCAL_INCLUDES += ["!..", ".."]
-
-CONFIGURE_SUBST_FILES += [
-    'rootAnalysis/Makefile',
-]
-
-SOURCES += [
-    'sharkctl.cpp',
-]
-
-if CONFIG['MOZ_INSTRUMENTS']:
-    SOURCES += [
-        'Instruments.cpp',
-    ]

js/src/moz.build

@@ -9,7 +9,6 @@ include('js-testing.mozbuild')
 
 DIRS += [
     'builtin',
-    'devtools',
 ]
 
 if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -22,6 +21,7 @@ if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
 CONFIGURE_SUBST_FILES += [
+    'devtools/rootAnalysis/Makefile',
     'js-config',
     'js.pc',
 ]
@@ -117,6 +117,7 @@ EXPORTS.js += [
 ]
 
 SOURCES += [
+    'devtools/sharkctl.cpp',
     'ds/LifoAlloc.cpp',
     'ds/MemoryProtectionExceptionHandler.cpp',
     'frontend/BytecodeCompiler.cpp',
@@ -357,6 +358,11 @@ if CONFIG['JS_POSIX_NSPR']:
         'vm/PosixNSPR.cpp',
     ]
 
+if CONFIG['MOZ_INSTRUMENTS']:
+    SOURCES += [
+        'devtools/Instruments.cpp',
+    ]
+
 if CONFIG['ENABLE_TRACE_LOGGING']:
     SOURCES += [
         'vm/TraceLogging.cpp',