Chromium Code Reviews| Index: testing/iossim/iossim.gyp |
| diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp |
| index 0fdd8b19057e5da74ecdeba47e49b38de1ee65dc..a621fd97bebeefe21c79f42190c6ce1eb55b3db1 100644 |
| --- a/testing/iossim/iossim.gyp |
| +++ b/testing/iossim/iossim.gyp |
| @@ -25,13 +25,6 @@ |
| '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', |
| @@ -83,7 +76,7 @@ |
| }], # 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', |
| @@ -118,11 +111,16 @@ |
| '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
justincohen
2015/06/02 01:20:40
GYP confuses me. If I don't include the block abo
Nico
2015/06/02 03:30:06
Ah, I guess the line below initializes it to 10.8,
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', |
| }, |
| }, |
| ], |