diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-11-04 13:48:57 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-11-04 13:58:35 -0500 |
| commit | 383bc182e3a3fe53cf79a51bc36c6218334d93b5 (patch) | |
| tree | 8f0ad6f5a5daddd470978e0c87dcb5ddc0ea7ea8 | |
| parent | 95e057e737e3edcb270c256000b893365e1d9a9b (diff) | |
| download | uxp-383bc182e3a3fe53cf79a51bc36c6218334d93b5.tar.gz | |
Issue #1676 - Part 13: Split perf sources out of js/src/moz.build
| -rw-r--r-- | js/src/moz.build | 14 | ||||
| -rw-r--r-- | js/src/perf/moz.build | 29 |
2 files changed, 30 insertions, 13 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index 906d5c0f73..71147dc8d6 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -49,7 +49,6 @@ EXPORTS += [ 'jstypes.h', 'jsversion.h', 'jswrapper.h', - 'perf/jsperf.h', ] # If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so @@ -110,6 +109,7 @@ DIRS += [ 'gc', 'irregexp', 'jit', + 'perf', ] if CONFIG['JS_BUNDLED_EDITLINE']: @@ -140,7 +140,6 @@ SOURCES += [ 'jsscript.cpp', 'jsstr.cpp', 'jsweakmap.cpp', - 'perf/jsperf.cpp', 'proxy/BaseProxyHandler.cpp', 'proxy/CrossCompartmentWrapper.cpp', 'proxy/DeadObjectProxy.cpp', @@ -294,17 +293,6 @@ if CONFIG['MOZ_VTUNE']: 'vtune/jitprofiling.c' ] -if CONFIG['HAVE_LINUX_PERF_EVENT_H']: - SOURCES += [ - 'perf/pm_linux.cpp' - ] - if CONFIG['LINUX_HEADERS_INCLUDES']: - SOURCES['perf/pm_linux.cpp'].flags += [CONFIG['LINUX_HEADERS_INCLUDES']] -else: - SOURCES += [ - 'perf/pm_stub.cpp' - ] - # JavaScript must be built shared, even for static builds, as it is used by # other modules which are always built shared. Failure to do so results in # the js code getting copied into xpinstall and jsd as well as mozilla-bin, diff --git a/js/src/perf/moz.build b/js/src/perf/moz.build new file mode 100644 index 0000000000..f0dd7e1d67 --- /dev/null +++ b/js/src/perf/moz.build @@ -0,0 +1,29 @@ +# -*- 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 += ["!..", ".."] + +EXPORTS += ['jsperf.h'] + +SOURCES += [ + 'jsperf.cpp', +] + +if CONFIG['HAVE_LINUX_PERF_EVENT_H']: + SOURCES += [ + 'pm_linux.cpp' + ] + if CONFIG['LINUX_HEADERS_INCLUDES']: + SOURCES['pm_linux.cpp'].flags += [CONFIG['LINUX_HEADERS_INCLUDES']] +else: + SOURCES += [ + 'pm_stub.cpp' + ]
\ No newline at end of file |