Issue #1676 - Part 20: Split vtune sources out of js/src/moz.build

2 files changed, 19 insertions, 7 deletions

diff --git a/js/src/moz.build b/js/src/moz.build
index 20c1e57226..f9e5233a9f 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -116,14 +116,17 @@ DIRS += [
     'wasm',
 ]
 
+if CONFIG['JS_HAS_CTYPES']:
+    DIRS += ['ctypes']
+
 if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
-if CONFIG['JS_HAS_CTYPES']:
-    DIRS += ['ctypes']
+if CONFIG['MOZ_VTUNE']:
+    DIRS += ['vtune']
 
 SOURCES += [
     'jsalloc.cpp',
@@ -233,11 +236,6 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
         'vm/TraceLoggingTypes.cpp',
     ]
 
-if CONFIG['MOZ_VTUNE']:
-    SOURCES += [
-        'vtune/jitprofiling.c'
-    ]
-
 # 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/vtune/moz.build b/js/src/vtune/moz.build
new file mode 100644
index 0000000000..4659197958
--- /dev/null
+++ b/js/src/vtune/moz.build
@@ -0,0 +1,14 @@
+# -*- 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 += ["!..", ".."]
+
+SOURCES += ['jitprofiling.c']
\ No newline at end of file