diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-05-01 15:53:52 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-05-01 15:53:52 -0400 |
| commit | dc43d59ae36d52a09bc7328f0cbb09c981e7adc8 (patch) | |
| tree | c9d003afca87ea3dad7949a4cfe5f652c7550204 | |
| parent | 61de1c80cdc6c04e71fde07cc5028af503438134 (diff) | |
| download | UXP-dc43d59ae36d52a09bc7328f0cbb09c981e7adc8.tar UXP-dc43d59ae36d52a09bc7328f0cbb09c981e7adc8.tar.gz UXP-dc43d59ae36d52a09bc7328f0cbb09c981e7adc8.tar.lz UXP-dc43d59ae36d52a09bc7328f0cbb09c981e7adc8.tar.xz UXP-dc43d59ae36d52a09bc7328f0cbb09c981e7adc8.zip | |
Issue #316 - Always build heapsnapshot regardless of the rest of the devtools for now
| -rw-r--r-- | devtools/moz.build | 12 | ||||
| -rw-r--r-- | devtools/shared/heapsnapshot/moz.build | 19 | ||||
| -rw-r--r-- | toolkit/toolkit.mozbuild | 3 |
3 files changed, 18 insertions, 16 deletions
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'] diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index 3b3bf80ae..b06c58162 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -132,8 +132,7 @@ DIRS += [ if CONFIG['MOZ_PREF_EXTENSIONS']: DIRS += ['/extensions/pref'] -if CONFIG['MOZ_DEVTOOLS_SERVER']: - DIRS += ['/devtools'] +DIRS += ['/devtools'] DIRS += [ '/services', |