diff options
author | sgurun <sgurun@chromium.org> | 2015-05-20 14:23:55 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 21:24:45 +0000 |
commit | b9d760ae212ab40c630a7c68e9eb27bae3bfab7a (patch) | |
tree | e3c5dcfc89b1192b2988b3cea340f27a53e1bf27 | |
parent | 0aa9eec172c697fb3546282bc099af64288d8c82 (diff) | |
download | chromium_src-b9d760ae212ab40c630a7c68e9eb27bae3bfab7a.zip chromium_src-b9d760ae212ab40c630a7c68e9eb27bae3bfab7a.tar.gz chromium_src-b9d760ae212ab40c630a7c68e9eb27bae3bfab7a.tar.bz2 |
Revert of Roll DEPS to class-dump 3.5 (patchset #4 id:60001 of https://codereview.chromium.org/1106993002/)
Reason for revert:
Breaking https://build.chromium.org/p/chromium.mac/builders/iOS_Device/builds/7076
Original issue's description:
> 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
>
> Committed: https://crrev.com/1c80791ce7c29a29fc816d89d1a5fa2ac6503b3e
> Cr-Commit-Position: refs/heads/master@{#330798}
TBR=justincohen@chromium.org,rohitrao@chromium.org,lliabraa@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=318160
Review URL: https://codereview.chromium.org/1147163003
Cr-Commit-Position: refs/heads/master@{#330804}
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | testing/iossim/class-dump.gyp | 189 | ||||
-rw-r--r-- | testing/iossim/iossim.gyp | 2 |
3 files changed, 2 insertions, 191 deletions
@@ -350,7 +350,7 @@ deps_os = { # class-dump utility to generate header files for undocumented SDKs 'src/testing/iossim/third_party/class-dump': - Var('chromium_git') + '/external/github.com/nygard/class-dump.git' + '@' + '77fb7f0a2953f10501768c7551aad261fa1310b9', + Var('chromium_git') + '/chromium/deps/class-dump.git' + '@' + '89bd40883c767584240b4dade8b74e6f57b9bdab', # Code that's not needed due to not building everything 'src/chrome/test/data/perf/canvas_bench': None, diff --git a/testing/iossim/class-dump.gyp b/testing/iossim/class-dump.gyp deleted file mode 100644 index 00cac57..0000000 --- a/testing/iossim/class-dump.gyp +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright (c) 2015 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. - -{ - 'targets': [ - { - 'target_name': 'class-dump', - 'toolsets': ['host'], - 'type': 'executable', - 'sources': [ - 'third_party/class-dump/class-dump.m', - 'third_party/class-dump/Source/CDBalanceFormatter.h', - 'third_party/class-dump/Source/CDBalanceFormatter.m', - 'third_party/class-dump/Source/CDClassDump.h', - 'third_party/class-dump/Source/CDClassDump.m', - 'third_party/class-dump/Source/CDClassDumpVisitor.h', - 'third_party/class-dump/Source/CDClassDumpVisitor.m', - 'third_party/class-dump/Source/CDClassFrameworkVisitor.h', - 'third_party/class-dump/Source/CDClassFrameworkVisitor.m', - 'third_party/class-dump/Source/CDDataCursor.h', - 'third_party/class-dump/Source/CDDataCursor.m', - 'third_party/class-dump/Source/CDExtensions.h', - 'third_party/class-dump/Source/CDFatArch.h', - 'third_party/class-dump/Source/CDFatArch.m', - 'third_party/class-dump/Source/CDFatFile.h', - 'third_party/class-dump/Source/CDFatFile.m', - 'third_party/class-dump/Source/CDFile.h', - 'third_party/class-dump/Source/CDFile.m', - 'third_party/class-dump/Source/CDFindMethodVisitor.h', - 'third_party/class-dump/Source/CDFindMethodVisitor.m', - 'third_party/class-dump/Source/CDLCDataInCode.h', - 'third_party/class-dump/Source/CDLCDataInCode.m', - 'third_party/class-dump/Source/CDLCDyldInfo.h', - 'third_party/class-dump/Source/CDLCDyldInfo.m', - 'third_party/class-dump/Source/CDLCDylib.h', - 'third_party/class-dump/Source/CDLCDylib.m', - 'third_party/class-dump/Source/CDLCDylinker.h', - 'third_party/class-dump/Source/CDLCDylinker.m', - 'third_party/class-dump/Source/CDLCDynamicSymbolTable.h', - 'third_party/class-dump/Source/CDLCDynamicSymbolTable.m', - 'third_party/class-dump/Source/CDLCEncryptionInfo.h', - 'third_party/class-dump/Source/CDLCEncryptionInfo.m', - 'third_party/class-dump/Source/CDLCFunctionStarts.h', - 'third_party/class-dump/Source/CDLCFunctionStarts.m', - 'third_party/class-dump/Source/CDLCLinkeditData.h', - 'third_party/class-dump/Source/CDLCLinkeditData.m', - 'third_party/class-dump/Source/CDLCMain.h', - 'third_party/class-dump/Source/CDLCMain.m', - 'third_party/class-dump/Source/CDLCPrebindChecksum.h', - 'third_party/class-dump/Source/CDLCPrebindChecksum.m', - 'third_party/class-dump/Source/CDLCPreboundDylib.h', - 'third_party/class-dump/Source/CDLCPreboundDylib.m', - 'third_party/class-dump/Source/CDLCRoutines32.h', - 'third_party/class-dump/Source/CDLCRoutines32.m', - 'third_party/class-dump/Source/CDLCRoutines64.h', - 'third_party/class-dump/Source/CDLCRoutines64.m', - 'third_party/class-dump/Source/CDLCRunPath.h', - 'third_party/class-dump/Source/CDLCRunPath.m', - 'third_party/class-dump/Source/CDLCSegment.h', - 'third_party/class-dump/Source/CDLCSegment.m', - 'third_party/class-dump/Source/CDLCSegment32.h', - 'third_party/class-dump/Source/CDLCSegment32.m', - 'third_party/class-dump/Source/CDLCSegment64.h', - 'third_party/class-dump/Source/CDLCSegment64.m', - 'third_party/class-dump/Source/CDLCSourceVersion.h', - 'third_party/class-dump/Source/CDLCSourceVersion.m', - 'third_party/class-dump/Source/CDLCSubClient.h', - 'third_party/class-dump/Source/CDLCSubClient.m', - 'third_party/class-dump/Source/CDLCSubFramework.h', - 'third_party/class-dump/Source/CDLCSubFramework.m', - 'third_party/class-dump/Source/CDLCSubLibrary.h', - 'third_party/class-dump/Source/CDLCSubLibrary.m', - 'third_party/class-dump/Source/CDLCSubUmbrella.h', - 'third_party/class-dump/Source/CDLCSubUmbrella.m', - 'third_party/class-dump/Source/CDLCSymbolTable.h', - 'third_party/class-dump/Source/CDLCSymbolTable.m', - 'third_party/class-dump/Source/CDLCTwoLevelHints.h', - 'third_party/class-dump/Source/CDLCTwoLevelHints.m', - 'third_party/class-dump/Source/CDLCUUID.h', - 'third_party/class-dump/Source/CDLCUUID.m', - 'third_party/class-dump/Source/CDLCUnixThread.h', - 'third_party/class-dump/Source/CDLCUnixThread.m', - 'third_party/class-dump/Source/CDLCUnknown.h', - 'third_party/class-dump/Source/CDLCUnknown.m', - 'third_party/class-dump/Source/CDLCVersionMinimum.h', - 'third_party/class-dump/Source/CDLCVersionMinimum.m', - 'third_party/class-dump/Source/CDLoadCommand.h', - 'third_party/class-dump/Source/CDLoadCommand.m', - 'third_party/class-dump/Source/CDMachOFile.h', - 'third_party/class-dump/Source/CDMachOFile.m', - 'third_party/class-dump/Source/CDMachOFileDataCursor.h', - 'third_party/class-dump/Source/CDMachOFileDataCursor.m', - 'third_party/class-dump/Source/CDMethodType.h', - 'third_party/class-dump/Source/CDMethodType.m', - 'third_party/class-dump/Source/CDMultiFileVisitor.h', - 'third_party/class-dump/Source/CDMultiFileVisitor.m', - 'third_party/class-dump/Source/CDOCCategory.h', - 'third_party/class-dump/Source/CDOCCategory.m', - 'third_party/class-dump/Source/CDOCClass.h', - 'third_party/class-dump/Source/CDOCClass.m', - 'third_party/class-dump/Source/CDOCInstanceVariable.h', - 'third_party/class-dump/Source/CDOCInstanceVariable.m', - 'third_party/class-dump/Source/CDOCMethod.h', - 'third_party/class-dump/Source/CDOCMethod.m', - 'third_party/class-dump/Source/CDOCModule.h', - 'third_party/class-dump/Source/CDOCModule.m', - 'third_party/class-dump/Source/CDOCProperty.h', - 'third_party/class-dump/Source/CDOCProperty.m', - 'third_party/class-dump/Source/CDOCProtocol.h', - 'third_party/class-dump/Source/CDOCProtocol.m', - 'third_party/class-dump/Source/CDOCSymtab.h', - 'third_party/class-dump/Source/CDOCSymtab.m', - 'third_party/class-dump/Source/CDObjectiveC1Processor.h', - 'third_party/class-dump/Source/CDObjectiveC1Processor.m', - 'third_party/class-dump/Source/CDObjectiveC2Processor.h', - 'third_party/class-dump/Source/CDObjectiveC2Processor.m', - 'third_party/class-dump/Source/CDObjectiveCProcessor.h', - 'third_party/class-dump/Source/CDObjectiveCProcessor.m', - 'third_party/class-dump/Source/CDProtocolUniquer.h', - 'third_party/class-dump/Source/CDProtocolUniquer.m', - 'third_party/class-dump/Source/CDRelocationInfo.h', - 'third_party/class-dump/Source/CDRelocationInfo.m', - 'third_party/class-dump/Source/CDSearchPathState.h', - 'third_party/class-dump/Source/CDSearchPathState.m', - 'third_party/class-dump/Source/CDSection.h', - 'third_party/class-dump/Source/CDSection.m', - 'third_party/class-dump/Source/CDSection32.h', - 'third_party/class-dump/Source/CDSection32.m', - 'third_party/class-dump/Source/CDSection64.h', - 'third_party/class-dump/Source/CDSection64.m', - 'third_party/class-dump/Source/CDStructureInfo.h', - 'third_party/class-dump/Source/CDStructureInfo.m', - 'third_party/class-dump/Source/CDStructureTable.h', - 'third_party/class-dump/Source/CDStructureTable.m', - 'third_party/class-dump/Source/CDSymbol.h', - 'third_party/class-dump/Source/CDSymbol.m', - 'third_party/class-dump/Source/CDTextClassDumpVisitor.h', - 'third_party/class-dump/Source/CDTextClassDumpVisitor.m', - 'third_party/class-dump/Source/CDTopoSortNode.h', - 'third_party/class-dump/Source/CDTopoSortNode.m', - 'third_party/class-dump/Source/CDTopologicalSortProtocol.h', - 'third_party/class-dump/Source/CDType.h', - 'third_party/class-dump/Source/CDType.m', - 'third_party/class-dump/Source/CDTypeController.h', - 'third_party/class-dump/Source/CDTypeController.m', - 'third_party/class-dump/Source/CDTypeFormatter.h', - 'third_party/class-dump/Source/CDTypeFormatter.m', - 'third_party/class-dump/Source/CDTypeLexer.h', - 'third_party/class-dump/Source/CDTypeLexer.m', - 'third_party/class-dump/Source/CDTypeName.h', - 'third_party/class-dump/Source/CDTypeName.m', - 'third_party/class-dump/Source/CDTypeParser.h', - 'third_party/class-dump/Source/CDTypeParser.m', - 'third_party/class-dump/Source/CDVisitor.h', - 'third_party/class-dump/Source/CDVisitor.m', - 'third_party/class-dump/Source/CDVisitorPropertyState.h', - 'third_party/class-dump/Source/CDVisitorPropertyState.m', - 'third_party/class-dump/Source/NSArray-CDExtensions.h', - 'third_party/class-dump/Source/NSArray-CDExtensions.m', - 'third_party/class-dump/Source/NSData-CDExtensions.h', - 'third_party/class-dump/Source/NSData-CDExtensions.m', - 'third_party/class-dump/Source/NSError-CDExtensions.h', - 'third_party/class-dump/Source/NSError-CDExtensions.m', - 'third_party/class-dump/Source/NSScanner-CDExtensions.h', - 'third_party/class-dump/Source/NSScanner-CDExtensions.m', - 'third_party/class-dump/Source/NSString-CDExtensions.h', - 'third_party/class-dump/Source/NSString-CDExtensions.m', - 'third_party/class-dump/Source/ULEB128.h', - 'third_party/class-dump/Source/ULEB128.m', - 'third_party/class-dump/Source/cd_objc2.h', - ], - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/usr/lib/libcrypto.dylib', - ], - 'include_dirs': [ - 'third_party/class-dump/Source', - ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'third_party/class-dump/class-dump-Prefix.pch', - 'WARNING_CFLAGS': [ - '-Wno-format', - '-Wno-deprecated', - ], - }, - }, - ], # targets -} diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp index 810a76e..0fdd8b1 100644 --- a/testing/iossim/iossim.gyp +++ b/testing/iossim/iossim.gyp @@ -83,7 +83,7 @@ }], # xcode_version ], # conditions 'dependencies': [ - 'class-dump.gyp:class-dump#host', + 'third_party/class-dump/class-dump.gyp:class-dump#host', ], 'include_dirs': [ '<(INTERMEDIATE_DIR)/iossim', |