diff options
| -rw-r--r-- | js/src/moz.build | 14 | ||||
| -rw-r--r-- | js/src/perf/moz.build | 29 |
2 files changed, 13 insertions, 30 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index b68732d122..897f60ae39 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -49,6 +49,7 @@ 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 @@ -109,7 +110,6 @@ DIRS += [ 'gc', 'irregexp', 'jit', - 'perf', ] if CONFIG['JS_BUNDLED_EDITLINE']: @@ -143,6 +143,7 @@ SOURCES += [ 'jsscript.cpp', 'jsstr.cpp', 'jsweakmap.cpp', + 'perf/jsperf.cpp', 'proxy/BaseProxyHandler.cpp', 'proxy/CrossCompartmentWrapper.cpp', 'proxy/DeadObjectProxy.cpp', @@ -296,6 +297,17 @@ 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 deleted file mode 100644 index f0dd7e1d67..0000000000 --- a/js/src/perf/moz.build +++ /dev/null @@ -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 += ["!..", ".."] - -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 |