wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-30 02:57:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 24b835f0a92881903c6e5f0cebb7ffa93c5e9d05.
This commit is contained in:
Moonchild 2022-09-05 13:25:24 +00:00 • committed by roytam1
commit 1c6fb7fcaa
2 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
js/src/devtools/moz.build
View file

@ -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',
]

8
js/src/moz.build
View file

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