From dc43d59ae36d52a09bc7328f0cbb09c981e7adc8 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 1 May 2018 15:53:52 -0400
Subject: Issue #316 - Always build heapsnapshot regardless of the rest of the
 devtools for now

---
 devtools/moz.build                     | 12 +++++++-----
 devtools/shared/heapsnapshot/moz.build | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'devtools')

diff --git a/devtools/moz.build b/devtools/moz.build
index 8e368facb..dd9f90c5a 100644
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -7,11 +7,13 @@
 if CONFIG['MOZ_DEVTOOLS']:
     DIRS += ['client']
 
-
-DIRS += [
-    'server',
-    'shared',
-]
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DIRS += [
+        'server',
+        'shared',
+    ]
+else:
+  DIRS += ['shared/heapsnapshot/']
 
 # /browser uses DIST_SUBDIR.  We opt-in to this treatment when building
 # DevTools for the browser to keep the root omni.ja slim for use by external XUL
diff --git a/devtools/shared/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build
index d020da727..fa9ef3915 100644
--- a/devtools/shared/heapsnapshot/moz.build
+++ b/devtools/shared/heapsnapshot/moz.build
@@ -48,15 +48,16 @@ DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 
 FINAL_LIBRARY = 'xul'
 
-DevToolsModules(
-    'census-tree-node.js',
-    'CensusUtils.js',
-    'DominatorTreeNode.js',
-    'HeapAnalysesClient.js',
-    'HeapAnalysesWorker.js',
-    'HeapSnapshotFileUtils.js',
-    'shortest-paths.js',
-)
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DevToolsModules(
+        'census-tree-node.js',
+        'CensusUtils.js',
+        'DominatorTreeNode.js',
+        'HeapAnalysesClient.js',
+        'HeapAnalysesWorker.js',
+        'HeapSnapshotFileUtils.js',
+        'shortest-paths.js',
+    )
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
-- 
cgit v1.2.3