diff options
| author | justincohen <justincohen@chromium.org> | 2015-06-02 16:11:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-02 23:13:05 +0000 |
| commit | b61668a8e23fcdbe8fd1e851c836a1a4d45fb054 (patch) | |
| tree | 902e117363121c1948606989ba0e116eb24711b6 /testing/iossim | |
| parent | a929c022ddb0cfcc7ea69d7a671e625b1cfc0d9f (diff) | |
| download | chromium_src-b61668a8e23fcdbe8fd1e851c836a1a4d45fb054.zip chromium_src-b61668a8e23fcdbe8fd1e851c836a1a4d45fb054.tar.gz chromium_src-b61668a8e23fcdbe8fd1e851c836a1a4d45fb054.tar.bz2 | |
Reland "Roll DEPS to class-dump 3.5"
Removes some build warnings.
Moves the class-dump repo to a github auto-mirror instead of a mirror
that needs to be manually updated.
This also requires that the class-dump.gyp file move from the
third-party repo into the main source tree. Note that the file
structure of the class-dump source changed so the .gyp had to be
updated. For comparison, the old .class-dump.gyp can be found at
https://chromium.googlesource.com/chromium/deps/class-dump/+/master/class-dump.gyp
BUG=318160, 417264
Review URL: https://codereview.chromium.org/1161813003
Cr-Commit-Position: refs/heads/master@{#332485}
Diffstat (limited to 'testing/iossim')
| -rw-r--r-- | testing/iossim/iossim.gyp | 15 | ||||
| -rw-r--r-- | testing/iossim/iossim.mm | 6 | ||||
| -rwxr-xr-x | testing/iossim/redirect-stdout.sh | 4 |
3 files changed, 7 insertions, 18 deletions
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp index 0fdd8b1..6041d39 100644 --- a/testing/iossim/iossim.gyp +++ b/testing/iossim/iossim.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'variables': { + 'mac_deployment_target': '10.8' + }, 'conditions': [ ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { 'targets': [ @@ -25,13 +28,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 +79,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', @@ -120,9 +116,6 @@ ], # actions 'xcode_settings': { 'ARCHS': ['x86_64'], - 'WARNING_CFLAGS': [ - '-Wno-objc-property-no-attribute', - ], }, }, ], diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm index 68d9aed..3910ba5 100644 --- a/testing/iossim/iossim.mm +++ b/testing/iossim/iossim.mm @@ -28,15 +28,9 @@ #import "DVTFoundation.h" #endif // IOSSIM_USE_XCODE_6 -@protocol OS_dispatch_queue -@end -@protocol OS_dispatch_source -@end // TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed // (crbug.com/385030). #if defined(IOSSIM_USE_XCODE_6) -@protocol OS_xpc_object -@end @protocol SimBridge; @class SimDeviceSet; @class SimDeviceType; diff --git a/testing/iossim/redirect-stdout.sh b/testing/iossim/redirect-stdout.sh index d6c3cf8..4465503 100755 --- a/testing/iossim/redirect-stdout.sh +++ b/testing/iossim/redirect-stdout.sh @@ -20,4 +20,6 @@ if [ ${#} -ne 2 ] ; then exit 2 fi -$1 | sed /cxx_destruct/d > $2 +echo "// Treat class-dump output as a system header." > $2 +echo "#pragma clang system_header" >> $2 +$1 | sed /cxx_destruct/d >> $2 |