summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2022-09-05 13:24:56 +0000
committerMoonchild <moonchild@palemoon.org>2022-09-05 13:24:56 +0000
commit22886d3547b506b26161dce27a0c8a6ddfffc48c (patch)
tree9b0c888e9c8718074a731cc3aef0a1c5a674dfc6
parentde87d59cfcfa275ff72aaa81035b26bf518a9d58 (diff)
downloaduxp-22886d3547b506b26161dce27a0c8a6ddfffc48c.tar.gz
Revert "Issue #1676 - Part 6: Split ds sources out of js/src/moz.build"
This reverts commit eedfa63a1d244426df38be6d72ee35422a5d9d82.
-rw-r--r--js/src/ds/moz.build17
-rw-r--r--js/src/moz.build3
2 files changed, 2 insertions, 18 deletions
diff --git a/js/src/ds/moz.build b/js/src/ds/moz.build
deleted file mode 100644
index a0b869706c..0000000000
--- a/js/src/ds/moz.build
+++ /dev/null
@@ -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',
-] \ No newline at end of file
diff --git a/js/src/moz.build b/js/src/moz.build
index 635d7bf35d..05234ed147 100644
--- a/js/src/moz.build
+++ b/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',