Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / testing / iossim / iossim.gyp

diff --git a/src/testing/iossim/iossim.gyp b/src/testing/iossim/iossim.gyp
index 2c1bd83..a8ad603 100644 (file)
--- a/src/testing/iossim/iossim.gyp
+++ b/src/testing/iossim/iossim.gyp
@@ -18,13 +18,20 @@
             'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')',
           },
           'conditions': [
-            ['xcode_version=="6.0"', {
+            ['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',
@@ -69,7 +76,7 @@
                   'message': 'Generating CoreSimulator.h',
                 },
               ],  # actions
-            }, {  # else: xcode_version!="6"
+            }, {  # else: xcode_version<"6.0"
               'variables': {
                 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks',
               },