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

This reverts commit 383bc182e3a3fe53cf79a51bc36c6218334d93b5.

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,

js/src/perf/moz.build

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