Build ipclist as part of ipc_fuzzer and simplify .gyp files.

I was hoping that the msan tool would give us a dump of the uninit
messages it was finding, in which case ipclist will give a quick
back-mapping from number to msg class.  So ensure that it builds.

This will not build unless enable_ipc_fuzzer=1 is specified, so
should not impact build times.

R=inferno@chromium.org

Review URL: https://codereview.chromium.org/355203003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280413 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 18 insertions, 35 deletions

diff --git a/tools/ipc_fuzzer/ipc_fuzzer.gyp b/tools/ipc_fuzzer/ipc_fuzzer.gyp
index 320cde4c..ba431f7 100644
--- a/tools/ipc_fuzzer/ipc_fuzzer.gyp
+++ b/tools/ipc_fuzzer/ipc_fuzzer.gyp
@@ -11,6 +11,7 @@
       'target_name': 'ipc_fuzzer',
       'type': 'none',
       'dependencies': [
+        'ipclist/ipclist.gyp:ipclist',
         'mutate/mutate.gyp:ipc_fuzzer_mutate',
         'mutate/mutate.gyp:ipc_fuzzer_generate',
         'mutate/mutate.gyp:ipc_message_util',
diff --git a/tools/ipc_fuzzer/ipclist/ipclist.gyp b/tools/ipc_fuzzer/ipclist/ipclist.gyp
index 86c0407..8586c866 100644
--- a/tools/ipc_fuzzer/ipclist/ipclist.gyp
+++ b/tools/ipc_fuzzer/ipclist/ipclist.gyp
@@ -10,9 +10,7 @@
       'target_name': 'ipclist',
       'type': 'executable',
       'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../skia/skia.gyp:skia',
-        '../../../third_party/khronos/khronos.gyp:khronos_headers',
+        '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [
         'ipclist.cc',
diff --git a/tools/ipc_fuzzer/message_lib/message_lib.gyp b/tools/ipc_fuzzer/message_lib/message_lib.gyp
index 64141d8..2a60852 100644
--- a/tools/ipc_fuzzer/message_lib/message_lib.gyp
+++ b/tools/ipc_fuzzer/message_lib/message_lib.gyp
@@ -5,20 +5,28 @@
 {
   'variables': {
     'chromium_code': 1,
+    'message_lib_deps': [
+      '../../../base/base.gyp:base',
+      '../../../chrome/chrome.gyp:common',
+      '../../../ipc/ipc.gyp:ipc',
+      '../../../media/cast/cast.gyp:cast_transport',
+      '../../../ppapi/ppapi_internal.gyp:ppapi_ipc',
+      '../../../skia/skia.gyp:skia',
+      '../../../third_party/libjingle/libjingle.gyp:libjingle',
+      '../../../third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
+      '../../../third_party/WebKit/public/blink.gyp:blink',
+      '../../../ui/accessibility/accessibility.gyp:ax_gen',
+    ],
   },
   'targets': [
     {
       'target_name': 'ipc_message_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../chrome/chrome.gyp:common',
-        '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/cast.gyp:cast_transport',
-        '../../../skia/skia.gyp:skia',
-        '../../../third_party/libjingle/libjingle.gyp:libjingle',
-        '../../../third_party/WebKit/public/blink.gyp:blink',
-        '../../../ui/accessibility/accessibility.gyp:ax_gen',
+         '<@(message_lib_deps)',
+      ],
+      'export_dependent_settings': [
+         '<@(message_lib_deps)',
       ],
       'sources': [
         'all_messages.h',
diff --git a/tools/ipc_fuzzer/mutate/mutate.gyp b/tools/ipc_fuzzer/mutate/mutate.gyp
index 1f63766..a68a078 100644
--- a/tools/ipc_fuzzer/mutate/mutate.gyp
+++ b/tools/ipc_fuzzer/mutate/mutate.gyp
@@ -11,16 +11,6 @@
       'target_name': 'ipc_fuzzer_mutate',
       'type': 'executable',
       'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../chrome/chrome.gyp:common',
-        '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/cast.gyp:cast_transport',
-        '../../../ppapi/ppapi_internal.gyp:ppapi_ipc',
-        '../../../skia/skia.gyp:skia',
-        '../../../third_party/libjingle/libjingle.gyp:libjingle',
-        '../../../third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
-        '../../../third_party/WebKit/public/blink.gyp:blink',
-        '../../../ui/accessibility/accessibility.gyp:ax_gen',
         '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [
@@ -48,16 +38,6 @@
       'target_name': 'ipc_fuzzer_generate',
       'type': 'executable',
       'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../chrome/chrome.gyp:common',
-        '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/cast.gyp:cast_transport',
-        '../../../ppapi/ppapi_internal.gyp:ppapi_ipc',
-        '../../../skia/skia.gyp:skia',
-        '../../../third_party/libjingle/libjingle.gyp:libjingle',
-        '../../../third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
-        '../../../third_party/WebKit/public/blink.gyp:blink',
-        '../../../ui/accessibility/accessibility.gyp:ax_gen',
         '../message_lib/message_lib.gyp:ipc_message_lib',
       ],
       'sources': [
diff --git a/tools/ipc_fuzzer/replay/replay.gyp b/tools/ipc_fuzzer/replay/replay.gyp
index ae47cc8..ad2d9e3 100644
--- a/tools/ipc_fuzzer/replay/replay.gyp
+++ b/tools/ipc_fuzzer/replay/replay.gyp
@@ -12,10 +12,6 @@
       'type': 'executable',
       'dependencies': [
         '../message_lib/message_lib.gyp:ipc_message_lib',
-        '../../../base/base.gyp:base',
-        '../../../chrome/chrome.gyp:common',
-        '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/cast.gyp:cast_transport',
       ],
       'sources': [
         'replay.cc',