aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/mac/Breakpad.xcodeproj/project.pbxproj100
-rw-r--r--src/client/mac/testapp/Controller.m2
-rw-r--r--src/common/test_assembler.cc2
-rw-r--r--src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj14
-rw-r--r--src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj194
-rw-r--r--src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj10
6 files changed, 235 insertions, 87 deletions
diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
index 9840d093..acdd7bf8 100644
--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
@@ -47,6 +47,9 @@
8B3102E611F0D74C00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
8B3102EB11F0D78000FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
8B31FC8211EFD2B800FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+ 8B4BDAAF12012BC5009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; };
+ 8B4BDABE12012CEF009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; };
+ 8B4BDAC512012D05009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */; };
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
D2A5DD301188633800081F03 /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
D2A5DD401188640400081F03 /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
@@ -433,9 +436,9 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
- 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
- 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+ 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
32DBCF5E0370ADEE00C91783 /* Breakpad_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Breakpad_Prefix.pch; path = Framework/Breakpad_Prefix.pch; sourceTree = "<group>"; };
3329D4EC0FA16D820007BBC5 /* Breakpad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Breakpad.xib; path = sender/Breakpad.xib; sourceTree = "<group>"; };
33880C7F0F9E097100817F82 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = sender/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -446,6 +449,7 @@
8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; };
8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; };
8B31FFF611F0C90500FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; };
+ 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
8DC2EF5B0486A6940098B216 /* Breakpad.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Breakpad.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DE43467411C72855004F095F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/Localizable.strings; sourceTree = "<group>"; };
DE43467511C72857004F095F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -509,7 +513,7 @@
F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = minidump_file_writer.cc; path = ../minidump_file_writer.cc; sourceTree = SOURCE_ROOT; };
F92C53900ECCE70A009BE4BA /* minidump_file_writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = minidump_file_writer.h; path = ../minidump_file_writer.h; sourceTree = SOURCE_ROOT; };
F92C53B70ECCE7B3009BE4BA /* Inspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Inspector.mm; path = crash_generation/Inspector.mm; sourceTree = SOURCE_ROOT; };
- F92C554A0ECCF530009BE4BA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+ F92C554A0ECCF530009BE4BA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
F92C55CE0ECD0064009BE4BA /* Breakpad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Breakpad.h; path = Framework/Breakpad.h; sourceTree = "<group>"; };
F92C55CF0ECD0064009BE4BA /* Breakpad.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Breakpad.mm; path = Framework/Breakpad.mm; sourceTree = "<group>"; };
F92C56310ECD0DF1009BE4BA /* OnDemandServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnDemandServer.h; path = Framework/OnDemandServer.h; sourceTree = "<group>"; };
@@ -542,7 +546,7 @@
F9C44DBB0EF072A0003AEBAA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = testapp/English.lproj/MainMenu.xib; sourceTree = "<group>"; };
F9C44DBF0EF0778F003AEBAA /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = testapp/Controller.h; sourceTree = "<group>"; };
F9C44DC00EF0778F003AEBAA /* TestClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClass.h; path = testapp/TestClass.h; sourceTree = "<group>"; };
- F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
+ F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
F9C44EE70EF0A3C1003AEBAA /* GTMLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMLogger.h; path = ../../common/mac/GTMLogger.h; sourceTree = SOURCE_ROOT; };
F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTMLogger.m; path = ../../common/mac/GTMLogger.m; sourceTree = SOURCE_ROOT; };
F9C77DDA0F7DD5CF0045F7DB /* UnitTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -578,6 +582,7 @@
files = (
8B31FC8211EFD2B800FCF3E4 /* Foundation.framework in Frameworks */,
F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */,
+ 8B4BDAAF12012BC5009C7060 /* libcrypto.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -596,6 +601,7 @@
buildActionMask = 2147483647;
files = (
8B31029411F0D54300FCF3E4 /* Foundation.framework in Frameworks */,
+ 8B4BDABE12012CEF009C7060 /* libcrypto.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -611,6 +617,7 @@
buildActionMask = 2147483647;
files = (
8B3102E611F0D74C00FCF3E4 /* Foundation.framework in Frameworks */,
+ 8B4BDAC512012D05009C7060 /* libcrypto.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -673,6 +680,7 @@
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 8B4BDAA7120124EA009C7060 /* libcrypto.dylib */,
8B3101E911F0CDE300FCF3E4 /* SenTestingKit.framework */,
F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */,
F92C554A0ECCF530009BE4BA /* Carbon.framework */,
@@ -1654,10 +1662,9 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch;
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
PRODUCT_NAME = Breakpad;
@@ -1673,7 +1680,7 @@
FRAMEWORK_VERSION = A;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch;
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
PRODUCT_NAME = Breakpad;
@@ -1700,11 +1707,7 @@
F92C53560ECCE34A009BE4BA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = "../..//**";
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-lcrypto",
- );
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = Inspector;
};
name = Debug;
@@ -1712,11 +1715,7 @@
F92C53570ECCE34A009BE4BA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = "../..//**";
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-lcrypto",
- );
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = Inspector;
};
name = Release;
@@ -1726,13 +1725,11 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
- GCC_DYNAMIC_NO_PIC = NO;
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"$(inherited)",
"-headerpad_max_install_names",
- "-lcrypto",
);
PRODUCT_NAME = breakpadUtilities;
};
@@ -1743,12 +1740,11 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"$(inherited)",
"-headerpad_max_install_names",
- "-lcrypto",
);
PRODUCT_NAME = breakpadUtilities;
};
@@ -1757,7 +1753,7 @@
F92C56A30ECE04A8009BE4BA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
INFOPLIST_FILE = "sender/crash_report_sender-Info.plist";
PRODUCT_NAME = crash_report_sender;
};
@@ -1766,7 +1762,7 @@
F92C56A40ECE04A8009BE4BA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
INFOPLIST_FILE = "sender/crash_report_sender-Info.plist";
PRODUCT_NAME = crash_report_sender;
};
@@ -1775,16 +1771,15 @@
F93803C00F808210004D428B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = "-lcrypto";
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = generator_test;
- USER_HEADER_SEARCH_PATHS = ../../;
};
name = Debug;
};
F93803C10F808210004D428B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = "-lcrypto";
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = generator_test;
};
name = Release;
@@ -1792,15 +1787,15 @@
F93DE2D30F82A67400608B94 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_OPTIMIZATION_LEVEL = 0;
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = minidump_file_writer_unittest;
- USER_HEADER_SEARCH_PATHS = ../../;
};
name = Debug;
};
F93DE2D40F82A67400608B94 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = minidump_file_writer_unittest;
};
name = Release;
@@ -1808,16 +1803,15 @@
F93DE32E0F82C55700608B94 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = "-lcrypto";
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = handler_test;
- USER_HEADER_SEARCH_PATHS = ../../;
};
name = Debug;
};
F93DE32F0F82C55700608B94 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = "-lcrypto";
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = handler_test;
};
name = Release;
@@ -1836,10 +1830,9 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Framework/Breakpad_Prefix.pch;
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "@executable_path/../Frameworks";
PRODUCT_NAME = Breakpad;
@@ -1850,11 +1843,7 @@
F93DE3BB0F830E7000608B94 /* Debug With Code Coverage */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = "../..//**";
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-lcrypto",
- );
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = Inspector;
};
name = "Debug With Code Coverage";
@@ -1864,13 +1853,11 @@
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
- GCC_DYNAMIC_NO_PIC = NO;
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
LD_DYLIB_INSTALL_NAME = "@executable_path/../Resources/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"$(inherited)",
"-headerpad_max_install_names",
- "-lcrypto",
);
PRODUCT_NAME = breakpadUtilities;
};
@@ -1879,7 +1866,7 @@
F93DE3BD0F830E7000608B94 /* Debug With Code Coverage */ = {
isa = XCBuildConfiguration;
buildSettings = {
- HEADER_SEARCH_PATHS = "../..//**";
+ HEADER_SEARCH_PATHS = ../..;
INFOPLIST_FILE = "sender/crash_report_sender-Info.plist";
PRODUCT_NAME = crash_report_sender;
};
@@ -1910,7 +1897,6 @@
);
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
INFOPLIST_FILE = "UnitTests-Info.plist";
- LIBRARY_SEARCH_PATHS = ./gcov;
PRODUCT_NAME = UnitTests;
WRAPPER_EXTENSION = octest;
};
@@ -1919,42 +1905,24 @@
F93DE3C10F830E7000608B94 /* Debug With Code Coverage */ = {
isa = XCBuildConfiguration;
buildSettings = {
- LIBRARY_SEARCH_PATHS = ./gcov;
- OTHER_LDFLAGS = (
- "-lgcov",
- "-lcrypto",
- "-framework",
- Foundation,
- );
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = generator_test;
- USER_HEADER_SEARCH_PATHS = ../../;
};
name = "Debug With Code Coverage";
};
F93DE3C20F830E7000608B94 /* Debug With Code Coverage */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
- LIBRARY_SEARCH_PATHS = ./gcov;
- OTHER_LDFLAGS = "-lgcov";
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = minidump_file_writer_unittest;
- USER_HEADER_SEARCH_PATHS = ../../;
};
name = "Debug With Code Coverage";
};
F93DE3C30F830E7000608B94 /* Debug With Code Coverage */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_GENERATE_TEST_COVERAGE_FILES = YES;
- GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
- LIBRARY_SEARCH_PATHS = ./gcov;
- OTHER_LDFLAGS = (
- "-lcrypto",
- "-lgcov",
- );
+ HEADER_SEARCH_PATHS = ../..;
PRODUCT_NAME = handler_test;
- USER_HEADER_SEARCH_PATHS = ../../;
};
name = "Debug With Code Coverage";
};
diff --git a/src/client/mac/testapp/Controller.m b/src/client/mac/testapp/Controller.m
index 7831a156..87c43024 100644
--- a/src/client/mac/testapp/Controller.m
+++ b/src/client/mac/testapp/Controller.m
@@ -76,7 +76,7 @@
NSString *resourcePath = [[NSBundle bundleForClass:
[self class]] resourcePath];
- NSString *execProgname;
+ NSString *execProgname = nil;
if (progCrashPoint == DURINGLAUNCH) {
execProgname = [resourcePath stringByAppendingString:@"/crashduringload"];
} else if (progCrashPoint == AFTERLAUNCH) {
diff --git a/src/common/test_assembler.cc b/src/common/test_assembler.cc
index 3271176c..7f5dd384 100644
--- a/src/common/test_assembler.cc
+++ b/src/common/test_assembler.cc
@@ -96,7 +96,7 @@ u_int64_t Label::operator-(const Label &label) const {
}
u_int64_t Label::Value() const {
- u_int64_t v;
+ u_int64_t v = 0;
ALWAYS_EVALUATE_AND_ASSERT(IsKnownConstant(&v));
return v;
};
diff --git a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
index d3d756b1..abf9565a 100644
--- a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
+++ b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
8B31FF8911F0C6FB00FCF3E4 /* module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF8611F0C6FB00FCF3E4 /* module.cc */; };
8B31FFC511F0C8AB00FCF3E4 /* dwarf2diehandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */; };
8B40BDC00C0638E4009535AF /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B40BDBF0C0638E4009535AF /* logging.cc */; };
+ 8B4BDBBD120131CA009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */; };
8DD76F9A0486AA7600D96B5E /* crash_report.mm in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* crash_report.mm */; settings = {ATTRIBUTES = (); }; };
8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
9B35FEEA0B26761C008DE8C7 /* basic_code_modules.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9B35FEE70B26761C008DE8C7 /* basic_code_modules.cc */; };
@@ -47,7 +48,7 @@
/* Begin PBXFileReference section */
08FB7796FE84155DC02AAC07 /* crash_report.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = crash_report.mm; sourceTree = "<group>"; };
- 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
5578003E0BE1F28500EC23E0 /* macho_utilities.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_utilities.cc; path = ../../../common/mac/macho_utilities.cc; sourceTree = SOURCE_ROOT; };
5578003F0BE1F28500EC23E0 /* macho_utilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_utilities.h; path = ../../../common/mac/macho_utilities.h; sourceTree = SOURCE_ROOT; };
8B31025311F0D2D400FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; };
@@ -72,6 +73,7 @@
8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf2diehandler.cc; path = ../../../common/dwarf/dwarf2diehandler.cc; sourceTree = SOURCE_ROOT; };
8B31FFC411F0C8AB00FCF3E4 /* dwarf2diehandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf2diehandler.h; path = ../../../common/dwarf/dwarf2diehandler.h; sourceTree = SOURCE_ROOT; };
8B40BDBF0C0638E4009535AF /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = logging.cc; path = ../../../processor/logging.cc; sourceTree = SOURCE_ROOT; };
+ 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
8DD76FA10486AA7600D96B5E /* crash_report */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crash_report; sourceTree = BUILT_PRODUCTS_DIR; };
9B35FEE20B2675F9008DE8C7 /* code_module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_module.h; path = ../../../google_breakpad/processor/code_module.h; sourceTree = SOURCE_ROOT; };
9B35FEE30B2675F9008DE8C7 /* code_modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_modules.h; path = ../../../google_breakpad/processor/code_modules.h; sourceTree = SOURCE_ROOT; };
@@ -134,6 +136,7 @@
buildActionMask = 2147483647;
files = (
8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */,
+ 8B4BDBBD120131CA009C7060 /* libcrypto.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -190,6 +193,7 @@
08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = {
isa = PBXGroup;
children = (
+ 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */,
08FB779EFE84155DC02AAC07 /* Foundation.framework */,
);
name = "External Frameworks and Libraries";
@@ -386,20 +390,16 @@
1DEB927508733DD40010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- OTHER_LDFLAGS = "-lcrypto";
+ HEADER_SEARCH_PATHS = ../../../../src;
PRODUCT_NAME = crash_report;
- USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";
};
name = Debug;
};
1DEB927608733DD40010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- OTHER_LDFLAGS = "-lcrypto";
+ HEADER_SEARCH_PATHS = ../../../../src;
PRODUCT_NAME = crash_report;
- USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";
};
name = Release;
};
diff --git a/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj b/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj
index 267745b7..2ddaf2c7 100644
--- a/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj
+++ b/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj
@@ -33,6 +33,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 8B4BDBCA12013288009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDBC912013288009C7060 /* libcrypto.dylib */; };
B84A91F8116CF78F006C210E /* libgtestmockall.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B88FB024116BDFFF00407530 /* libgtestmockall.a */; };
B84A91FB116CF7AF006C210E /* module.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FAE241166603300407530 /* module.cc */; };
B84A91FC116CF7AF006C210E /* stabs_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FAE3C11666C8900407530 /* stabs_to_module.cc */; };
@@ -84,7 +85,6 @@
B88FB13F116CF38300407530 /* bytereader_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FB0DA116CEC5800407530 /* bytereader_unittest.cc */; };
B88FB14F116CF4AE00407530 /* libgtestmockall.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B88FB024116BDFFF00407530 /* libgtestmockall.a */; };
B88FB152116CF4D300407530 /* byte_cursor_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FB0D4116CEC0600407530 /* byte_cursor_unittest.cc */; };
- B89E0E601166556C00DD08C9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */; };
B89E0E781166576C00DD08C9 /* macho_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E6E1166571D00DD08C9 /* macho_reader.cc */; };
B89E0E7A1166576C00DD08C9 /* macho_dump.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E701166573700DD08C9 /* macho_dump.cc */; };
B89E0E9911665A7200DD08C9 /* macho_reader_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E6D1166571D00DD08C9 /* macho_reader_unittest.cc */; };
@@ -269,12 +269,13 @@
/* Begin PBXFileReference section */
08FB7796FE84155DC02AAC07 /* dump_syms.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = dump_syms.mm; path = ../../../common/mac/dump_syms.mm; sourceTree = "<group>"; };
- 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
557800890BE1F3AB00EC23E0 /* macho_utilities.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_utilities.cc; path = ../../../common/mac/macho_utilities.cc; sourceTree = SOURCE_ROOT; };
5578008A0BE1F3AB00EC23E0 /* macho_utilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_utilities.h; path = ../../../common/mac/macho_utilities.h; sourceTree = SOURCE_ROOT; };
8B31023E11F0CF1C00FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; };
8B3102D411F0D60300FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; };
8B3102D511F0D60300FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; };
+ 8B4BDBC912013288009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
9BDF186D0B1BB43700F8391B /* dump_syms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dump_syms.h; path = ../../../common/mac/dump_syms.h; sourceTree = "<group>"; };
9BDF186E0B1BB43700F8391B /* dump_syms_tool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = dump_syms_tool.mm; sourceTree = "<group>"; };
9BE650410B52F6D800611104 /* file_id.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = file_id.cc; path = ../../../common/mac/file_id.cc; sourceTree = SOURCE_ROOT; };
@@ -326,7 +327,6 @@
B88FB11F116CF27F00407530 /* dwarf_cfi_to_module_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dwarf_cfi_to_module_unittest; sourceTree = BUILT_PRODUCTS_DIR; };
B88FB135116CF30F00407530 /* bytereader_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = bytereader_unittest; sourceTree = BUILT_PRODUCTS_DIR; };
B88FB14B116CF4A700407530 /* byte_cursor_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = byte_cursor_unittest; sourceTree = BUILT_PRODUCTS_DIR; };
- B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
B89E0E6D1166571D00DD08C9 /* macho_reader_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader_unittest.cc; path = ../../../common/mac/macho_reader_unittest.cc; sourceTree = SOURCE_ROOT; };
B89E0E6E1166571D00DD08C9 /* macho_reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader.cc; path = ../../../common/mac/macho_reader.cc; sourceTree = SOURCE_ROOT; };
B89E0E6F1166571D00DD08C9 /* macho_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macho_reader.h; path = ../../../common/mac/macho_reader.h; sourceTree = SOURCE_ROOT; };
@@ -456,7 +456,7 @@
buildActionMask = 2147483647;
files = (
B8C5B523116653BA00D34F4E /* Foundation.framework in Frameworks */,
- B89E0E601166556C00DD08C9 /* libcrypto.dylib in Frameworks */,
+ 8B4BDBCA12013288009C7060 /* libcrypto.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -500,8 +500,8 @@
08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = {
isa = PBXGroup;
children = (
+ 8B4BDBC912013288009C7060 /* libcrypto.dylib */,
08FB779EFE84155DC02AAC07 /* Foundation.framework */,
- B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
@@ -1225,6 +1225,13 @@
B84A91F6116CF784006C210E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = stabs_to_module_unittest;
};
name = Debug;
@@ -1232,6 +1239,13 @@
B84A91F7116CF784006C210E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = stabs_to_module_unittest;
};
name = Release;
@@ -1239,6 +1253,13 @@
B88FAF31116A591F00407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -1251,6 +1272,13 @@
B88FAF32116A591F00407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -1278,6 +1306,13 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H;
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = stabs_reader_unittest;
};
name = Debug;
@@ -1286,6 +1321,13 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H;
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = stabs_reader_unittest;
};
name = Release;
@@ -1293,8 +1335,13 @@
B88FB025116BE00100407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = gtestmockall;
};
name = Debug;
@@ -1302,6 +1349,13 @@
B88FB026116BE00100407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = gtestmockall;
};
name = Release;
@@ -1309,6 +1363,13 @@
B88FB0BB116CEAC000407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = module_unittest;
};
name = Debug;
@@ -1316,6 +1377,13 @@
B88FB0BC116CEAC000407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = module_unittest;
};
name = Release;
@@ -1323,6 +1391,13 @@
B88FB0E1116CEEA800407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf2diehandler_unittest;
};
name = Debug;
@@ -1330,6 +1405,13 @@
B88FB0E2116CEEA800407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf2diehandler_unittest;
};
name = Release;
@@ -1337,6 +1419,13 @@
B88FB0F4116CEF1900407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf_line_to_module_unittest;
};
name = Debug;
@@ -1344,6 +1433,13 @@
B88FB0F5116CEF1900407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf_line_to_module_unittest;
};
name = Release;
@@ -1351,6 +1447,13 @@
B88FB10C116CF07A00407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf_cu_to_module_unittest;
};
name = Debug;
@@ -1358,6 +1461,13 @@
B88FB10D116CF07A00407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf_cu_to_module_unittest;
};
name = Release;
@@ -1365,6 +1475,13 @@
B88FB121116CF28000407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf_cfi_to_module_unittest;
};
name = Debug;
@@ -1372,6 +1489,13 @@
B88FB122116CF28000407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = dwarf_cfi_to_module_unittest;
};
name = Release;
@@ -1379,6 +1503,13 @@
B88FB137116CF30F00407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = bytereader_unittest;
};
name = Debug;
@@ -1386,6 +1517,13 @@
B88FB138116CF30F00407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = bytereader_unittest;
};
name = Release;
@@ -1393,6 +1531,13 @@
B88FB14D116CF4A800407530 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = byte_cursor_unittest;
};
name = Debug;
@@ -1400,6 +1545,13 @@
B88FB14E116CF4A800407530 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = byte_cursor_unittest;
};
name = Release;
@@ -1421,6 +1573,13 @@
B89E0E9711665A6400DD08C9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = macho_reader_unittest;
};
name = Debug;
@@ -1428,6 +1587,13 @@
B89E0E9811665A6400DD08C9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = macho_reader_unittest;
};
name = Release;
@@ -1451,6 +1617,13 @@
D21F97D411CBA0F200239E38 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = test_assembler_unittest;
};
name = Debug;
@@ -1458,6 +1631,13 @@
D21F97D511CBA0F200239E38 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ $inherited,
+ ../../../testing,
+ ../../../testing/include,
+ ../../../testing/gtest,
+ ../../../testing/gtest/include,
+ );
PRODUCT_NAME = test_assembler_unittest;
};
name = Release;
diff --git a/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj b/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj
index 73b58ddb..a6a78dc5 100644
--- a/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj
+++ b/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj
@@ -31,7 +31,7 @@
/* Begin PBXFileReference section */
08FB7796FE84155DC02AAC07 /* symupload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = symupload.m; sourceTree = "<group>"; };
- 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
8B31022B11F0CE6900FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; };
8B3102B611F0D5CE00FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; };
8B3102B711F0D5CE00FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; };
@@ -175,16 +175,16 @@
1DEB927508733DD40010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = ../../..;
PRODUCT_NAME = symupload;
- USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)";
};
name = Debug;
};
1DEB927608733DD40010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = ../../..;
PRODUCT_NAME = symupload;
- USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)";
};
name = Release;
};
@@ -205,16 +205,16 @@
9BD836030B0544BB0055103E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = ../../..;
PRODUCT_NAME = minidump_upload;
- USER_HEADER_SEARCH_PATHS = "../../../**";
};
name = Debug;
};
9BD836040B0544BB0055103E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ HEADER_SEARCH_PATHS = ../../..;
PRODUCT_NAME = minidump_upload;
- USER_HEADER_SEARCH_PATHS = "../../../**";
};
name = Release;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-29 15:25:24 +0000