Reland "Roll DEPS to class-dump 3.5"

testing/iossim/iossim.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', {

[Nico, 2015/06/02 03:30:06]

Wait this block isn't even used with xcode. How can this have an effect there?

[justincohen, 2015/06/02 17:05:58]

xcode sub's out to ninja for this.

       'targets': [
         {
           'target_name': 'iossim',
           'toolsets': ['host'],
           '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}\')',
           },
           'conditions': [
             ['xcode_version>="6.0"', {
               'variables': {
                 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
               },
               'defines': [
                 'IOSSIM_USE_XCODE_6',
               ],
-              'xcode_settings': {
-                # The CoreSimulator.h file generated by class-dump defines a
-                # property of type |NSString*| and a setter for the property
-                # that takes a parameter of type |id|. This type mismatch causes
-                # a compiler warning, so turn off -Werror.
-                'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
-              },
               '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'
                   ],
@@ skipping 31 matching lines @@
                   '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': [
-            'third_party/class-dump/class-dump.gyp:class-dump#host',
+            '<(DEPTH)/third_party/class-dump/class-dump.gyp:class-dump#host',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)/iossim',
           ],
           'sources': [
             'iossim.mm',
             '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h',
           ],
           'libraries': [
             '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
@@ skipping 14 matching lines @@
                 # 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 -I -CiPhoneSimulator <(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework',
                 '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h',
               ],
               'message': 'Generating DVTiPhoneSimulatorRemoteClient.h',
             },
           ],  # actions
+          'target_conditions': [
+            ['_toolset=="host"', {
+              'xcode_settings': {
+                'MACOSX_DEPLOYMENT_TARGET': '10.8',
+              }
+            }]
+          ],

[Nico, 2015/06/01 22:31:21]

Do you need this block when you set the same thing unconditionally below?

[justincohen, 2015/06/02 01:20:40]

GYP confuses me.  If I don't include the block above, the builds fail for ninja,
presumably because of the line in build/common.gypi here:
https://chromium.googlesource.com/chromium/src/build/+/master/common.gypi#5384

However, the MACOSX_DEPLOYMENT_TARGET set below on line 123 seems to work for
xcode builds.  

[Nico, 2015/06/02 03:30:06]

Ah, I guess the line below initializes it to 10.8, and target_conditions are
processed later so the line you linked to overwrites it.
…but then I don't understand why it would work for Xcode. Does it work with both
generators if you remove the lower setting?

Or can you set mac_deployment_target in the variables block on this target and
let build/common.gypi do the rest?

[justincohen, 2015/06/02 17:05:58]

mac_deployment_target did the trick!

           'xcode_settings': {
             'ARCHS': ['x86_64'],
-            'WARNING_CFLAGS': [
-              '-Wno-objc-property-no-attribute',
-            ],
+            'MACOSX_DEPLOYMENT_TARGET': '10.8',
           },
         },
       ],
     }, {  # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"
       'variables': {
         'ninja_output_dir': 'ninja-iossim',
         'ninja_product_dir':
           '$(SYMROOT)/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
       },
       'targets': [
@@ skipping 18 matching lines @@
                 'iossim',
               ],
               'message': 'Generating the iossim executable',
             },
           ],
         },
       ],
     }],
   ],
 }