Skip to content

Commit

Permalink
Roll thirdparty/class-dump to fix build for the latest Xcode.
Browse files Browse the repository at this point in the history
This is a reland of https://codereview.chromium.org/1270383005/,
which broke Xcode builds.

BUG=517930

Review URL: https://codereview.chromium.org/1275273003

Cr-Commit-Position: refs/heads/master@{#342569}
  • Loading branch information
justincohen authored and Commit bot committed Aug 9, 2015
1 parent fc6ad47 commit c2637cc
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ deps_os = {

# class-dump utility to generate header files for undocumented SDKs
'src/third_party/class-dump/src':
Var('chromium_git') + '/external/github.com/nygard/class-dump.git' + '@' + '93e7c6a5419380d89656dcc511dc60d475199b67',
Var('chromium_git') + '/external/github.com/nygard/class-dump.git' + '@' + '978d177ca6f0d2e5e34acf3e8dadc63e3140ebbc',

# Code that's not needed due to not building everything
'src/chrome/test/data/perf/canvas_bench': None,
Expand Down
3 changes: 2 additions & 1 deletion testing/iossim/iossim.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

{
'variables': {
'mac_deployment_target': '10.8'
'mac_deployment_target': '10.9',
'mac_sdk_min': '10.9',
},
'conditions': [
['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', {
Expand Down
1 change: 1 addition & 0 deletions testing/iossim/iossim.mm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ @protocol SimBridge;
@class DVTSimulatorApplication;
@class SimDeviceSet;
@class SimDeviceType;
@class SimProfilesPathMonitor;
@class SimRuntime;
@class SimServiceConnectionManager;
#import "CoreSimulator.h"
Expand Down
2 changes: 1 addition & 1 deletion third_party/class-dump/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Name: class-dump
URL: https://github.com/nygard/class-dump
Version: 3.5
License: GPL
Revision: 93e7c6a5419380d89656dcc511dc60d475199b67
Revision: 978d177ca6f0d2e5e34acf3e8dadc63e3140ebbc
Security Critical: NO

Description:
Expand Down
33 changes: 15 additions & 18 deletions third_party/class-dump/class-dump.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

{
'variables': {
'mac_deployment_target': '10.8'
'mac_deployment_target': '10.9',
'mac_sdk_min': '10.9',
},
'targets': [
{
Expand Down Expand Up @@ -62,10 +63,6 @@
'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',
Expand All @@ -80,12 +77,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',
Expand All @@ -98,10 +95,18 @@
'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',
Expand All @@ -114,12 +119,6 @@
'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',
Expand All @@ -128,10 +127,6 @@
'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',
Expand All @@ -140,9 +135,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',
Expand All @@ -169,6 +164,8 @@
'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': {
Expand Down

0 comments on commit c2637cc

Please sign in to comment.