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

This reverts commit eedfa63a1d244426df38be6d72ee35422a5d9d82.

js/src/ds/moz.build

@@ -1,17 +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 += ["!..", ".."]
-
-SOURCES += [
-    'LifoAlloc.cpp',
-    'MemoryProtectionExceptionHandler.cpp',
-]

js/src/moz.build

@@ -10,7 +10,6 @@ include('js-testing.mozbuild')
 DIRS += [
     'builtin',
     'devtools',
-    'ds',
 ]
 
 if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -118,6 +117,8 @@ EXPORTS.js += [
 ]
 
 SOURCES += [
+    'ds/LifoAlloc.cpp',
+    'ds/MemoryProtectionExceptionHandler.cpp',
     'frontend/BytecodeCompiler.cpp',
     'frontend/BytecodeEmitter.cpp',
     'frontend/FoldConstants.cpp',