Remove support for old version of Xcode from iossim.

testing/iossim/iossim.gyp

Index: testing/iossim/iossim.gyp
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp
index c4a45b62a9795884aca6af3d78b11f8b08a754dc..2a8c2ae7383b5f1022e31e959375fddcffadd39a 100644
--- a/testing/iossim/iossim.gyp
+++ b/testing/iossim/iossim.gyp
@@ -16,69 +16,8 @@
           'type': 'executable',
           'variables': {
             'developer_dir': '<!(xcode-select -print-path)',
-            # TODO(lliabraa): Once all builders are on Xcode 6 this variable can
-            # be removed and the actions gated by this variable can be run by
-            # default (crbug.com/385030).
-            'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')',
+            'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
           },
-          'conditions': [
-            ['xcode_version>="6.0"', {
-              'variables': {
-                'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
-              },
-              'defines': [
-                'IOSSIM_USE_XCODE_6',
-              ],
-              'actions': [
-                {
-                  'action_name': 'generate_dvt_foundation_header',
-                  'inputs': [
-                    '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation',
-                    '<(PRODUCT_DIR)/class-dump',
-                  ],
-                  'outputs': [
-                    '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h'
-                  ],
-                  'action': [
-                    # Actions don't provide a way to redirect stdout, so a custom
-                    # script is invoked that will execute the first argument and
-                    # write the output to the file specified as the second argument.
-                    # -I sorts classes, categories, and protocols by inheritance.
-                    # -C <regex> only displays classes matching regular expression.
-                    './redirect-stdout.sh',
-                    '<(PRODUCT_DIR)/class-dump -CDVTStackBacktrace|DVTInvalidation|DVTMixIn <(iphone_sim_path)/DVTFoundation.framework',
-                    '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h',
-                  ],
-                  'message': 'Generating DVTFoundation.h',
-                },
-                {
-                  'action_name': 'generate_dvt_core_simulator',
-                  'inputs': [
-                    '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator',
-                    '<(PRODUCT_DIR)/class-dump',
-                  ],
-                  'outputs': [
-                    '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h'
-                  ],
-                  'action': [
-                    # Actions don't provide a way to redirect stdout, so a custom
-                    # script is invoked that will execute the first argument and
-                    # write the output to the file specified as the second argument.
-                    # -I sorts classes, categories, and protocols by inheritance.
-                    # -C <regex> only displays classes matching regular expression.
-                    './redirect-stdout.sh',
-                    '<(PRODUCT_DIR)/class-dump -CSim <(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework',
-                    '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h',
-                  ],
-                  'message': 'Generating CoreSimulator.h',
-                },
-              ],  # actions
-            }, {  # else: xcode_version<"6.0"
-              'variables': {
-                'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks',
-              },
-            }],  # xcode_version
-          ],  # conditions
           'dependencies': [
             '<(DEPTH)/third_party/class-dump/class-dump.gyp:class-dump#host',
           ],
@@ -94,6 +33,48 @@
           ],
           'actions': [
             {
+              'action_name': 'generate_dvt_foundation_header',
+              'inputs': [
+                '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation',
+                '<(PRODUCT_DIR)/class-dump',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h'
+              ],
+              'action': [
+                # Actions don't provide a way to redirect stdout, so a custom
+                # script is invoked that will execute the first argument and
+                # write the output to the file specified as the second argument.
+                # -I sorts classes, categories, and protocols by inheritance.
+                # -C <regex> only displays classes matching regular expression.
+                './redirect-stdout.sh',
+                '<(PRODUCT_DIR)/class-dump -CDVTStackBacktrace|DVTInvalidation|DVTMixIn <(iphone_sim_path)/DVTFoundation.framework',
+                '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h',
+              ],
+              'message': 'Generating DVTFoundation.h',
+            },
+            {
+              'action_name': 'generate_dvt_core_simulator',
+              'inputs': [
+                '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator',
+                '<(PRODUCT_DIR)/class-dump',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h'
+              ],
+              'action': [
+                # Actions don't provide a way to redirect stdout, so a custom
+                # script is invoked that will execute the first argument and
+                # write the output to the file specified as the second argument.
+                # -I sorts classes, categories, and protocols by inheritance.
+                # -C <regex> only displays classes matching regular expression.
+                './redirect-stdout.sh',
+                '<(PRODUCT_DIR)/class-dump -CSim <(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework',
+                '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h',
+              ],
+              'message': 'Generating CoreSimulator.h',
+            },
+            {
               'action_name': 'generate_dvt_iphone_sim_header',
               'inputs': [
                 '<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework/Versions/Current/DVTiPhoneSimulatorRemoteClient',