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

This reverts commit 65eac50e2dd9d2c4773a927aa7909eff13bc121c.

js/src/gc/moz.build

@@ -1,29 +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 += [
-    'Allocator.cpp',
-    'Barrier.cpp',
-    'GCTrace.cpp',
-    'Iteration.cpp',
-    'Marking.cpp',
-    'Memory.cpp',
-    'MemoryProfiler.cpp',
-    'Nursery.cpp',
-    'RootMarking.cpp',
-    'Statistics.cpp',
-    'StoreBuffer.cpp',
-    'Tracer.cpp',
-    'Verifier.cpp',
-    'Zone.cpp',
-]

js/src/moz.build

@@ -107,7 +107,6 @@ DIRS += [
     'devtools',
     'ds',
     'frontend',
-    'gc',
 ]
 
 if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -120,6 +119,19 @@ if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
 SOURCES += [
+    'gc/Allocator.cpp',
+    'gc/Barrier.cpp',
+    'gc/GCTrace.cpp',
+    'gc/Iteration.cpp',
+    'gc/Marking.cpp',
+    'gc/Memory.cpp',
+    'gc/MemoryProfiler.cpp',
+    'gc/Nursery.cpp',
+    'gc/RootMarking.cpp',
+    'gc/Statistics.cpp',
+    'gc/Tracer.cpp',
+    'gc/Verifier.cpp',
+    'gc/Zone.cpp',
     'irregexp/NativeRegExpMacroAssembler.cpp',
     'irregexp/RegExpAST.cpp',
     'irregexp/RegExpCharacters.cpp',
@@ -322,6 +334,7 @@ SOURCES += [
 # instantiations may or may not be needed depending on what it gets bundled
 # with.
 SOURCES += [
+    'gc/StoreBuffer.cpp',
     'jsarray.cpp',
     'jsatom.cpp',
     'jsdtoa.cpp',