Use open-vcdiff for sdch compression on the Mac

Review URL: http://codereview.chromium.org/4096

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2628 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 55 insertions, 0 deletions

diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index 8ad821a..12bd44b 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -106,6 +106,9 @@
 		7BA3614C0E8C34390023C8B9 /* backend_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33090E5A190600A747DB /* backend_unittest.cc */; };
 		7BA3614E0E8C347E0023C8B9 /* cookie_policy_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32620E5A181C00A747DB /* cookie_policy_unittest.cc */; };
 		7BA361ED0E8C38D30023C8B9 /* proxy_service_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BA361EC0E8C38D30023C8B9 /* proxy_service_unittest.cc */; };
+		7BA362B60E8C3D020023C8B9 /* sdch_filter.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BA3615E0E8C35A50023C8B9 /* sdch_filter.cc */; };
+		7BA362B70E8C3D040023C8B9 /* sdch_filter_unitest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BA361600E8C35A50023C8B9 /* sdch_filter_unitest.cc */; };
+		7BA362C40E8C3D4C0023C8B9 /* libsdch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BA362C10E8C3D2B0023C8B9 /* libsdch.a */; };
 		7BD8F70C0E65DCD800034DE9 /* block_files_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32F90E5A190600A747DB /* block_files_unittest.cc */; };
 		7BD8F70D0E65DCE000034DE9 /* disk_cache_test_base.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32D50E5A190600A747DB /* disk_cache_test_base.cc */; };
 		7BD8F70E0E65DCE500034DE9 /* disk_cache_test_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32FA0E5A190600A747DB /* disk_cache_test_util.cc */; };
@@ -301,6 +304,20 @@
 			remoteGlobalIDString = D2AAC045055464E500DB518D;
 			remoteInfo = zlib;
 		};
+		7BA362C00E8C3D2B0023C8B9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7BA362B90E8C3D2B0023C8B9 /* sdch.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 7BA361A70E8C36E50023C8B9;
+			remoteInfo = sdch;
+		};
+		7BA362C20E8C3D3C0023C8B9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7BA362B90E8C3D2B0023C8B9 /* sdch.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 7BA361A60E8C36E50023C8B9;
+			remoteInfo = sdch;
+		};
 		7BED32490E5A17C000A747DB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = E4AFA6450E5241D300201347 /* base.xcodeproj */;
@@ -392,6 +409,7 @@
 		7BA361600E8C35A50023C8B9 /* sdch_filter_unitest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdch_filter_unitest.cc; sourceTree = "<group>"; };
 		7BA361EB0E8C38C60023C8B9 /* http_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_version.h; sourceTree = "<group>"; };
 		7BA361EC0E8C38D30023C8B9 /* proxy_service_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = proxy_service_unittest.cc; path = proxy/proxy_service_unittest.cc; sourceTree = "<group>"; };
+		7BA362B90E8C3D2B0023C8B9 /* sdch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sdch.xcodeproj; path = sdch/sdch.xcodeproj; sourceTree = "<group>"; };
 		7BED316E0E5A145200A747DB /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
 		7BED316F0E5A145200A747DB /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
 		7BED31700E5A145200A747DB /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
@@ -657,6 +675,7 @@
 				7BA015780E5A1C7500044150 /* libicuuc.a in Frameworks */,
 				7B85026D0E5A38D400730B43 /* libmodp_b64.a in Frameworks */,
 				7BED34190E5A1A8600A747DB /* libnet.a in Frameworks */,
+				7BA362C40E8C3D4C0023C8B9 /* libsdch.a in Frameworks */,
 				7BA0169E0E5A1EAE00044150 /* libzlib.a in Frameworks */,
 				82113A280E84360200E3848F /* Security.framework in Frameworks */,
 			);
@@ -742,6 +761,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		7BA362BA0E8C3D2B0023C8B9 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7BA362C10E8C3D2B0023C8B9 /* libsdch.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		7BED316D0E5A142300A747DB /* Configuration */ = {
 			isa = PBXGroup;
 			children = (
@@ -1086,6 +1113,7 @@
 				7BA015570E5A1C3E00044150 /* icu.xcodeproj */,
 				7B2630600E82F282001CE27F /* libevent.xcodeproj */,
 				7B8502620E5A38BB00730B43 /* modp_b64.xcodeproj */,
+				7BA362B90E8C3D2B0023C8B9 /* sdch.xcodeproj */,
 				7BA016930E5A1E8700044150 /* zlib.xcodeproj */,
 			);
 			name = Projects;
@@ -1131,6 +1159,7 @@
 				7B2630670E82F291001CE27F /* PBXTargetDependency */,
 				7B85026C0E5A38C600730B43 /* PBXTargetDependency */,
 				7BED34180E5A1A7800A747DB /* PBXTargetDependency */,
+				7BA362C30E8C3D3C0023C8B9 /* PBXTargetDependency */,
 				7BA0169C0E5A1E9A00044150 /* PBXTargetDependency */,
 			);
 			name = net_unittests;
@@ -1178,6 +1207,10 @@
 					ProjectRef = 7B8502620E5A38BB00730B43 /* modp_b64.xcodeproj */;
 				},
 				{
+					ProductGroup = 7BA362BA0E8C3D2B0023C8B9 /* Products */;
+					ProjectRef = 7BA362B90E8C3D2B0023C8B9 /* sdch.xcodeproj */;
+				},
+				{
 					ProductGroup = 7BA016940E5A1E8700044150 /* Products */;
 					ProjectRef = 7BA016930E5A1E8700044150 /* zlib.xcodeproj */;
 				},
@@ -1284,6 +1317,13 @@
 			remoteRef = 7BA016970E5A1E8700044150 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		7BA362C10E8C3D2B0023C8B9 /* libsdch.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsdch.a;
+			remoteRef = 7BA362C00E8C3D2B0023C8B9 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		7BED324A0E5A17C000A747DB /* libbase.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1383,6 +1423,7 @@
 				E49DD3370E8933A2003C7A87 /* proxy_service.cc in Sources */,
 				7B85043D0E5B2E6400730B43 /* rankings.cc in Sources */,
 				7B8B5B560E5CEADE002F9A97 /* registry_controlled_domain.cc in Sources */,
+				7BA362B60E8C3D020023C8B9 /* sdch_filter.cc in Sources */,
 				E49DD2EA0E892F8C003C7A87 /* sdch_manager.cc in Sources */,
 				7B8504410E5B2E9600730B43 /* stats.cc in Sources */,
 				DFEE18270E882E3600666107 /* stats_histogram.cc in Sources */,
@@ -1440,6 +1481,7 @@
 				7BA361ED0E8C38D30023C8B9 /* proxy_service_unittest.cc in Sources */,
 				7B8B5B9E0E5D188E002F9A97 /* registry_controlled_domain_unittest.cc in Sources */,
 				E4AFA6430E5241B400201347 /* run_all_unittests.cc in Sources */,
+				7BA362B70E8C3D040023C8B9 /* sdch_filter_unitest.cc in Sources */,
 				7BD8F7110E65DCF500034DE9 /* storage_block_unittest.cc in Sources */,
 				E47E93430E8924EE00CA613E /* tcp_client_socket_unittest.cc in Sources */,
 				7BA361450E8C341F0023C8B9 /* test_completion_callback_unittest.cc in Sources */,
@@ -1490,6 +1532,11 @@
 			name = zlib;
 			targetProxy = 7BA0169B0E5A1E9A00044150 /* PBXContainerItemProxy */;
 		};
+		7BA362C30E8C3D3C0023C8B9 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = sdch;
+			targetProxy = 7BA362C20E8C3D3C0023C8B9 /* PBXContainerItemProxy */;
+		};
 		7BED34160E5A1A6F00A747DB /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = base;
@@ -1528,7 +1575,9 @@
 			baseConfigurationReference = 7BED31720E5A145200A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
 					..,
+					"../sdch/open_vcdiff/depot/opensource/open-vcdiff/src",
 					../third_party/icu38/public/common,
 					../third_party/icu38/public/i18n,
 				);
@@ -1541,7 +1590,9 @@
 			baseConfigurationReference = 7BED31720E5A145200A747DB /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
 					..,
+					"../sdch/open_vcdiff/depot/opensource/open-vcdiff/src",
 					../third_party/icu38/public/common,
 					../third_party/icu38/public/i18n,
 				);
@@ -1595,7 +1646,9 @@
 					UNIT_TEST,
 				);
 				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
 					..,
+					"../sdch/open_vcdiff/depot/opensource/open-vcdiff/src",
 					../testing/gtest/include,
 					../testing/gtest/include/gtest,
 				);
@@ -1612,7 +1665,9 @@
 					UNIT_TEST,
 				);
 				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
 					..,
+					"../sdch/open_vcdiff/depot/opensource/open-vcdiff/src",
 					../testing/gtest/include,
 					../testing/gtest/include/gtest,
 				);