diff options
| -rw-r--r-- | js/src/devtools/moz.build | 25 | ||||
| -rw-r--r-- | js/src/moz.build | 8 |
2 files changed, 26 insertions, 7 deletions
diff --git a/js/src/devtools/moz.build b/js/src/devtools/moz.build new file mode 100644 index 000000000..cb2fc3256 --- /dev/null +++ b/js/src/devtools/moz.build @@ -0,0 +1,25 @@ +# -*- 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', + ] diff --git a/js/src/moz.build b/js/src/moz.build index 67b25470c..8c22ce71d 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -11,6 +11,7 @@ FILES_PER_UNIFIED_FILE = 6 DIRS += [ 'builtin', + 'devtools', ] if CONFIG['JS_BUNDLED_EDITLINE']: @@ -20,7 +21,6 @@ if not CONFIG['JS_DISABLE_SHELL']: DIRS += ['shell'] CONFIGURE_SUBST_FILES += [ - 'devtools/rootAnalysis/Makefile', 'js-config', 'js.pc', ] @@ -116,7 +116,6 @@ EXPORTS.js += [ ] SOURCES += [ - 'devtools/sharkctl.cpp', 'ds/LifoAlloc.cpp', 'ds/MemoryProtectionExceptionHandler.cpp', 'frontend/BytecodeCompiler.cpp', @@ -357,11 +356,6 @@ 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', |