Remove webrtc_all target

Move all its configuration to all.gyp instead, which is
not processed by Chromium builds (webrtc.gyp is).

BUG=webrtc:5949
NOTRY=True

Review-Url: https://codereview.webrtc.org/2060873002
Cr-Commit-Position: refs/heads/master@{#13124}

OWNERS

@@ -4,8 +4,9 @@ niklas.enbom@webrtc.org
 tina.legrand@webrtc.org
 tommi@webrtc.org
 per-file .gitignore=*
-per-file AUTHORS=*
 per-file .gn=kjellander@webrtc.org
+per-file *.gyp=*
+per-file AUTHORS=*
 per-file BUILD.gn=kjellander@webrtc.org
 per-file DEPS=*
 per-file PRESUBMIT.py=kjellander@webrtc.org

all.gyp

@@ -11,19 +11,53 @@
     'include_examples%': 1,
     'include_tests%': 1,
   },
+  'includes': [
+    'webrtc/build/common.gypi',
+  ],
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
+        'webrtc/api/api.gyp:*',
+        'webrtc/base/base.gyp:*',
+        'webrtc/common.gyp:*',
+        'webrtc/common_audio/common_audio.gyp:*',
+        'webrtc/common_video/common_video.gyp:*',
+        'webrtc/media/media.gyp:*',
+        'webrtc/modules/modules.gyp:*',
+        'webrtc/p2p/p2p.gyp:*',
+        'webrtc/pc/pc.gyp:*',
+        'webrtc/system_wrappers/system_wrappers.gyp:*',
+        'webrtc/tools/tools.gyp:*',
+        'webrtc/voice_engine/voice_engine.gyp:*',
         'webrtc/webrtc.gyp:*',
+        '<(webrtc_vp8_dir)/vp8.gyp:*',
+        '<(webrtc_vp9_dir)/vp9.gyp:*',
       ],
       'conditions': [
+        ['include_tests==1', {
+          'includes': [
+            'webrtc/webrtc_tests.gypi',
+          ],
+          'dependencies': [
+            'webrtc/api/api_tests.gyp:*',
+            'webrtc/common_video/common_video_unittests.gyp:*',
+            'webrtc/system_wrappers/system_wrappers_tests.gyp:*',
+            'webrtc/test/metrics.gyp:*',
+            'webrtc/test/test.gyp:*',
+          ],
+        }],
         ['include_examples==1', {
           'dependencies': [
             'webrtc/webrtc_examples.gyp:*',
           ],
         }],
+        ['(OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7"))', {
+          'dependencies': [
+            'webrtc/sdk/sdk.gyp:*',
+          ],
+        }],
         ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
           'dependencies': [
             'talk/app/webrtc/legacy_objc_api.gyp:*',

webrtc/webrtc.gyp

@@ -6,101 +6,6 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 {
-  'variables': {
-    'webrtc_all_dependencies': [
-      'base/base.gyp:*',
-      'common.gyp:*',
-      'common_audio/common_audio.gyp:*',
-      'common_video/common_video.gyp:*',
-      'media/media.gyp:*',
-      'modules/modules.gyp:*',
-      'p2p/p2p.gyp:*',
-      'pc/pc.gyp:*',
-      'system_wrappers/system_wrappers.gyp:*',
-      'tools/tools.gyp:*',
-      'voice_engine/voice_engine.gyp:*',
-      '<(webrtc_vp8_dir)/vp8.gyp:*',
-      '<(webrtc_vp9_dir)/vp9.gyp:*',
-    ],
-  },
-  'conditions': [
-    ['build_with_chromium==0', {
-      # TODO(kjellander): Move this to webrtc_all_dependencies once all of talk/
-      # has been moved to webrtc/. It can't be processed by Chromium since the
-      # reference to buid/java.gypi is using an absolute path (and includes
-      # entries cannot contain variables).
-      'variables': {
-        'webrtc_all_dependencies': [
-          'api/api.gyp:*',
-        ],
-      },
-    }],
-    ['build_with_chromium==0 and'
-     '(OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7"))', {
-      # TODO(kjellander): Move this to webrtc_all_dependencies once all of talk/
-      # has been moved to webrtc/. It can't be processed by Chromium since the
-      # reference to buid/java.gypi is using an absolute path (and includes
-      # entries cannot contain variables).
-      'variables': {
-        'webrtc_all_dependencies': [
-          'sdk/sdk.gyp:*',
-        ],
-      },
-    }],
-    ['include_tests==1', {
-      'includes': [
-        'webrtc_tests.gypi',
-      ],
-    }],
-    ['enable_protobuf==1', {
-      'targets': [
-        {
-          # This target should only be built if enable_protobuf is defined
-          'target_name': 'rtc_event_log_proto',
-          'type': 'static_library',
-          'sources': ['call/rtc_event_log.proto',],
-          'variables': {
-            'proto_in_dir': 'call',
-            'proto_out_dir': 'webrtc/call',
-          },
-        'includes': ['build/protoc.gypi'],
-        },
-      ],
-    }],
-    ['enable_protobuf==1', {
-      'targets': [
-        {
-          'target_name': 'rtc_event_log_parser',
-          'type': 'static_library',
-          'sources': [
-            'call/rtc_event_log_parser.cc',
-            'call/rtc_event_log_parser.h',
-          ],
-          'dependencies': [
-            'rtc_event_log_proto',
-          ],
-          'export_dependent_settings': [
-            'rtc_event_log_proto',
-          ],
-        },
-      ],
-    }],
-    ['include_tests==1 and enable_protobuf==1', {
-      'targets': [
-        {
-          'target_name': 'rtc_event_log2rtp_dump',
-          'type': 'executable',
-          'sources': ['call/rtc_event_log2rtp_dump.cc',],
-          'dependencies': [
-            '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
-            'rtc_event_log_parser',
-            'rtc_event_log_proto',
-            'test/test.gyp:rtp_test_utils'
-          ],
-        },
-      ],
-    }],
-  ],
   'includes': [
     'build/common.gypi',
     'audio/webrtc_audio.gypi',
@@ -108,27 +13,6 @@
     'video/webrtc_video.gypi',
   ],
   'targets': [
-    {
-      'target_name': 'webrtc_all',
-      'type': 'none',
-      'dependencies': [
-        '<@(webrtc_all_dependencies)',
-        'webrtc',
-      ],
-      'conditions': [
-        ['include_tests==1', {
-          'dependencies': [
-            'api/api_tests.gyp:*',
-            'common_video/common_video_unittests.gyp:*',
-            'rtc_unittests',
-            'system_wrappers/system_wrappers_tests.gyp:*',
-            'test/metrics.gyp:*',
-            'test/test.gyp:*',
-            'webrtc_tests',
-          ],
-        }],
-      ],
-    },
     {
       'target_name': 'webrtc',
       'type': 'static_library',
@@ -185,6 +69,56 @@
         }],
       ],
     },
-
+  ],  # targets
+  'conditions': [
+    ['include_tests==1', {
+      'includes': [
+        'webrtc_tests.gypi',
       ],
+    }],
+    ['enable_protobuf==1', {
+      'targets': [
+        {
+          # This target should only be built if enable_protobuf is defined
+          'target_name': 'rtc_event_log_proto',
+          'type': 'static_library',
+          'sources': ['call/rtc_event_log.proto',],
+          'variables': {
+            'proto_in_dir': 'call',
+            'proto_out_dir': 'webrtc/call',
+          },
+          'includes': ['build/protoc.gypi'],
+        },
+        {
+          'target_name': 'rtc_event_log_parser',
+          'type': 'static_library',
+          'sources': [
+            'call/rtc_event_log_parser.cc',
+            'call/rtc_event_log_parser.h',
+          ],
+          'dependencies': [
+            'rtc_event_log_proto',
+          ],
+          'export_dependent_settings': [
+            'rtc_event_log_proto',
+          ],
+        },
+      ],
+    }],
+    ['include_tests==1 and enable_protobuf==1', {
+      'targets': [
+        {
+          'target_name': 'rtc_event_log2rtp_dump',
+          'type': 'executable',
+          'sources': ['call/rtc_event_log2rtp_dump.cc',],
+          'dependencies': [
+            '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+            'rtc_event_log_parser',
+            'rtc_event_log_proto',
+            'test/test.gyp:rtp_test_utils'
+          ],
+        },
+      ],
+    }],
+  ],  # conditions
 }