diff options
author | thakis <thakis@chromium.org> | 2015-08-08 15:45:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-08 22:46:50 +0000 |
commit | a73119a6aacb2295d801b91d58cbe04eac3ffe63 (patch) | |
tree | 0a73a03343aa8acaa607e199687b572cc54bc602 /third_party/class-dump | |
parent | 291c000dd06d1fb1291adec1756ce01c8f5ac020 (diff) | |
download | chromium_src-a73119a6aacb2295d801b91d58cbe04eac3ffe63.zip chromium_src-a73119a6aacb2295d801b91d58cbe04eac3ffe63.tar.gz chromium_src-a73119a6aacb2295d801b91d58cbe04eac3ffe63.tar.bz2 |
Revert of Roll thirdparty/class-dump to fix build for the latest Xcode (patchset #2 id:20001 of https://codereview.chromium.org/1270383005/ )
Reason for revert:
Broke two main waterfall bots:
http://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_%28dbg%29/builds/29951
http://build.chromium.org/p/chromium.mac/builders/iOS_Device/builds/15885
../../../third_party/class-dump/src/Source/CDLCEncryptionInfo.m:12:39:error: field has incomplete type 'struct encryption_info_command_64'
struct encryption_info_command_64 _encryptionInfoCommand;
^
../../../third_party/class-dump/src/Source/CDLCEncryptionInfo.m:12:12: note: forward declaration of 'struct encryption_info_command_64'
struct encryption_info_command_64 _encryptionInfoCommand;
^
../../../third_party/class-dump/src/Source/CDLCEncryptionInfo.m:24:43:error: use of undeclared identifier 'LC_ENCRYPTION_INFO_64'
if (_encryptionInfoCommand.cmd == LC_ENCRYPTION_INFO_64) {
^
../../../third_party/class-dump/src/Source/CDLCSegment.m:278:54:error: use of undeclared identifier 'kCCAlgorithmAES'; did you mean 'kCCAlgorithmDES'?
status = CCCryptorCreate(kCCDecrypt, kCCAlgorithmAES, 0, keyData, 32, NULL, &cryptor1);
^~~~~~~~~~~~~~~
kCCAlgorithmDES
/Applications/Xcode6.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/CommonCrypto/CommonCryptor.h:151:5: note: 'kCCAlgorithmDES' declared here
kCCAlgorithmDES,
^
../../../third_party/class-dump/src/Source/CDLCSegment.m:281:54:error: use of undeclared identifier 'kCCAlgorithmAES'; did you mean 'kCCAlgorithmDES'?
status = CCCryptorCreate(kCCDecrypt, kCCAlgorithmAES, 0, keyData + 32, 32, NULL, &cryptor2);
^~~~~~~~~~~~~~~
kCCAlgorithmDES
/Applications/Xcode6.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include/CommonCrypto/CommonCryptor.h:151:5: note: 'kCCAlgorithmDES' declared here
kCCAlgorithmDES,
^
Original issue's description:
> Roll thirdparty/class-dump to fix build for the latest Xcode
>
> BUG=517930
>
> Committed: https://crrev.com/60fc2cd20f1fc6371d04dcfc16d838508896c4a1
> Cr-Commit-Position: refs/heads/master@{#342541}
TBR=rohitrao@chromium.org,justincohen@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=517930
Review URL: https://codereview.chromium.org/1273103003
Cr-Commit-Position: refs/heads/master@{#342543}
Diffstat (limited to 'third_party/class-dump')
-rw-r--r-- | third_party/class-dump/README.chromium | 2 | ||||
-rw-r--r-- | third_party/class-dump/class-dump.gyp | 33 |
2 files changed, 19 insertions, 16 deletions
diff --git a/third_party/class-dump/README.chromium b/third_party/class-dump/README.chromium index 54bb405..4e0f68e 100644 --- a/third_party/class-dump/README.chromium +++ b/third_party/class-dump/README.chromium @@ -2,7 +2,7 @@ Name: class-dump URL: https://github.com/nygard/class-dump Version: 3.5 License: GPL -Revision: 978d177ca6f0d2e5e34acf3e8dadc63e3140ebbc +Revision: 93e7c6a5419380d89656dcc511dc60d475199b67 Security Critical: NO Description: diff --git a/third_party/class-dump/class-dump.gyp b/third_party/class-dump/class-dump.gyp index 876f3a5..60d0678 100644 --- a/third_party/class-dump/class-dump.gyp +++ b/third_party/class-dump/class-dump.gyp @@ -4,8 +4,7 @@ { 'variables': { - 'mac_deployment_target': '10.9', - 'mac_sdk_min': '10.9', + 'mac_deployment_target': '10.8' }, 'targets': [ { @@ -63,6 +62,10 @@ 'src/Source/CDLCRunPath.m', 'src/Source/CDLCSegment.h', 'src/Source/CDLCSegment.m', + 'src/Source/CDLCSegment32.h', + 'src/Source/CDLCSegment32.m', + 'src/Source/CDLCSegment64.h', + 'src/Source/CDLCSegment64.m', 'src/Source/CDLCSourceVersion.h', 'src/Source/CDLCSourceVersion.m', 'src/Source/CDLCSubClient.h', @@ -77,12 +80,12 @@ 'src/Source/CDLCSymbolTable.m', 'src/Source/CDLCTwoLevelHints.h', 'src/Source/CDLCTwoLevelHints.m', + 'src/Source/CDLCUUID.h', + 'src/Source/CDLCUUID.m', 'src/Source/CDLCUnixThread.h', 'src/Source/CDLCUnixThread.m', 'src/Source/CDLCUnknown.h', 'src/Source/CDLCUnknown.m', - 'src/Source/CDLCUUID.h', - 'src/Source/CDLCUUID.m', 'src/Source/CDLCVersionMinimum.h', 'src/Source/CDLCVersionMinimum.m', 'src/Source/CDLoadCommand.h', @@ -95,18 +98,10 @@ 'src/Source/CDMethodType.m', 'src/Source/CDMultiFileVisitor.h', 'src/Source/CDMultiFileVisitor.m', - 'src/Source/CDObjectiveC1Processor.h', - 'src/Source/CDObjectiveC1Processor.m', - 'src/Source/CDObjectiveC2Processor.h', - 'src/Source/CDObjectiveC2Processor.m', - 'src/Source/CDObjectiveCProcessor.h', - 'src/Source/CDObjectiveCProcessor.m', 'src/Source/CDOCCategory.h', 'src/Source/CDOCCategory.m', 'src/Source/CDOCClass.h', 'src/Source/CDOCClass.m', - 'src/Source/CDOCClassReference.h', - 'src/Source/CDOCClassReference.m', 'src/Source/CDOCInstanceVariable.h', 'src/Source/CDOCInstanceVariable.m', 'src/Source/CDOCMethod.h', @@ -119,6 +114,12 @@ 'src/Source/CDOCProtocol.m', 'src/Source/CDOCSymtab.h', 'src/Source/CDOCSymtab.m', + 'src/Source/CDObjectiveC1Processor.h', + 'src/Source/CDObjectiveC1Processor.m', + 'src/Source/CDObjectiveC2Processor.h', + 'src/Source/CDObjectiveC2Processor.m', + 'src/Source/CDObjectiveCProcessor.h', + 'src/Source/CDObjectiveCProcessor.m', 'src/Source/CDProtocolUniquer.h', 'src/Source/CDProtocolUniquer.m', 'src/Source/CDRelocationInfo.h', @@ -127,6 +128,10 @@ 'src/Source/CDSearchPathState.m', 'src/Source/CDSection.h', 'src/Source/CDSection.m', + 'src/Source/CDSection32.h', + 'src/Source/CDSection32.m', + 'src/Source/CDSection64.h', + 'src/Source/CDSection64.m', 'src/Source/CDStructureInfo.h', 'src/Source/CDStructureInfo.m', 'src/Source/CDStructureTable.h', @@ -135,9 +140,9 @@ 'src/Source/CDSymbol.m', 'src/Source/CDTextClassDumpVisitor.h', 'src/Source/CDTextClassDumpVisitor.m', - 'src/Source/CDTopologicalSortProtocol.h', 'src/Source/CDTopoSortNode.h', 'src/Source/CDTopoSortNode.m', + 'src/Source/CDTopologicalSortProtocol.h', 'src/Source/CDType.h', 'src/Source/CDType.m', 'src/Source/CDTypeController.h', @@ -164,8 +169,6 @@ 'src/Source/NSScanner-CDExtensions.m', 'src/Source/NSString-CDExtensions.h', 'src/Source/NSString-CDExtensions.m', - 'src/Source/ULEB128.h', - 'src/Source/ULEB128.m', 'src/Source/cd_objc2.h', ], 'link_settings': { |