adding more grit love to other targets, updating scons files for things that work on mac. moving the shell script phase to a standalone target to share it between targets. adding new unit test files.

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

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

2 files changed, 166 insertions, 18 deletions

diff --git a/chrome/chrome.xcodeproj/browser_prebuild.sh b/chrome/chrome.xcodeproj/generate_headers.sh
index b7921f1..b7921f1 100755
--- a/chrome/chrome.xcodeproj/browser_prebuild.sh
+++ b/chrome/chrome.xcodeproj/generate_headers.sh
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 927ae96..a9c08e3 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -48,6 +48,17 @@
 			name = run_ui_tests;
 			productName = run_ui_tests;
 		};
+		E45076900F1532CE003BE099 /* Generate Headers */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = E45076930F15330D003BE099 /* Build configuration list for PBXAggregateTarget "Generate Headers" */;
+			buildPhases = (
+				E450768F0F1532CE003BE099 /* Run Shell Script */,
+			);
+			dependencies = (
+			);
+			name = "Generate Headers";
+			productName = "Generated Headers";
+		};
 		E4F325930EE837BF002533CE /* run_ipc_tests */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = E4F325970EE837BF002533CE /* Build configuration list for PBXAggregateTarget "run_ipc_tests" */;
@@ -244,6 +255,16 @@
 		E45076180F150DD2003BE099 /* template_url_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9460E9D4839009A6919 /* template_url_model.cc */; };
 		E450761A0F150DE9003BE099 /* url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9510E9D4839009A6919 /* url_fetcher.cc */; };
 		E45076200F150E0C003BE099 /* web_database.cc in Sources */ = {isa = PBXBuildFile; fileRef = E450761E0F150E0C003BE099 /* web_database.cc */; };
+		E45076850F1530CD003BE099 /* pref_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBEA0E9D4C9F009A6919 /* pref_service.cc */; };
+		E45076A90F153619003BE099 /* resource_dispatcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBF60E9D4C9F009A6919 /* resource_dispatcher.cc */; };
+		E45076AB0F153629003BE099 /* time_format.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFC0A0E9D4C9F009A6919 /* time_format.cc */; };
+		E45076C90F1537F5003BE099 /* dom_ui_bindings.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D640CC30EAE868600EBCFC0 /* dom_ui_bindings.cc */; };
+		E45076CB0F15380C003BE099 /* external_host_bindings.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D640CC50EAE868600EBCFC0 /* external_host_bindings.cc */; };
+		E45076CF0F153871003BE099 /* localized_error.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D640CCB0EAE868600EBCFC0 /* localized_error.cc */; };
+		E45076D90F1538E4003BE099 /* dom_automation_controller.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45076D70F1538E4003BE099 /* dom_automation_controller.cc */; };
+		E45076E50F153AB6003BE099 /* unzip.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45076E40F153AB6003BE099 /* unzip.cc */; };
+		E450775F0F154036003BE099 /* mru_cache_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBD40E9D4C9F009A6919 /* mru_cache_unittest.cc */; };
+		E45077620F15405C003BE099 /* notification_service_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBDB0E9D4C9F009A6919 /* notification_service_unittest.cc */; };
 		E48FB9590EC4E9C10052B72B /* safe_browsing_database_bloom.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFADF0E9D49DE009A6919 /* safe_browsing_database_bloom.cc */; };
 		E48FB95C0EC4E9DD0052B72B /* safe_browsing_database_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAE10E9D49DE009A6919 /* safe_browsing_database_impl.cc */; };
 		E48FB9760EC4EA320052B72B /* url_request_failed_dns_job.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48FB96E0EC4EA270052B72B /* url_request_failed_dns_job.cc */; };
@@ -830,6 +851,27 @@
 			remoteGlobalIDString = 4D640CEA0EAE86BD00EBCFC0;
 			remoteInfo = renderer;
 		};
+		E450769C0F1534DD003BE099 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4D7BF2E90E9D46A4009A6919 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E45076900F1532CE003BE099 /* Generate Headers */;
+			remoteInfo = "Generate Headers";
+		};
+		E450769E0F1534E8003BE099 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4D7BF2E90E9D46A4009A6919 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E45076900F1532CE003BE099 /* Generate Headers */;
+			remoteInfo = "Generate Headers";
+		};
+		E45076D10F153891003BE099 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4D7BF2E90E9D46A4009A6919 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = E45076900F1532CE003BE099 /* Generate Headers */;
+			remoteInfo = "Generate Headers";
+		};
 		E4F3259A0EE837DD002533CE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 4D7BF2E90E9D46A4009A6919 /* Project object */;
@@ -1499,7 +1541,6 @@
 		4D7BFC1A0E9D4CB9009A6919 /* libcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4D7BFCA90E9D4D5D009A6919 /* chrome_canvas.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chrome_canvas.cc; sourceTree = "<group>"; };
 		4D7BFCAA0E9D4D5D009A6919 /* chrome_canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chrome_canvas.h; sourceTree = "<group>"; };
-		4D7BFCAB0E9D4D5D009A6919 /* chrome_font.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chrome_font.cc; sourceTree = "<group>"; };
 		4D7BFCAC0E9D4D5D009A6919 /* chrome_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chrome_font.h; sourceTree = "<group>"; };
 		4D7BFCAD0E9D4D5D009A6919 /* color_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = color_utils.cc; sourceTree = "<group>"; };
 		4D7BFCAE0E9D4D5D009A6919 /* color_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = color_utils.h; sourceTree = "<group>"; };
@@ -1588,6 +1629,11 @@
 		E45075F60F150C0C003BE099 /* session_id.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = session_id.cc; path = sessions/session_id.cc; sourceTree = "<group>"; };
 		E450761E0F150E0C003BE099 /* web_database.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = web_database.cc; path = webdata/web_database.cc; sourceTree = "<group>"; };
 		E450761F0F150E0C003BE099 /* web_database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = web_database.h; path = webdata/web_database.h; sourceTree = "<group>"; };
+		E45076D60F1538E4003BE099 /* dom_automation_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dom_automation_controller.h; path = automation/dom_automation_controller.h; sourceTree = "<group>"; };
+		E45076D70F1538E4003BE099 /* dom_automation_controller.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dom_automation_controller.cc; path = automation/dom_automation_controller.cc; sourceTree = "<group>"; };
+		E45076E30F153AB6003BE099 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
+		E45076E40F153AB6003BE099 /* unzip.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unzip.cc; sourceTree = "<group>"; };
+		E45076E80F153B06003BE099 /* unzip_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unzip_unittest.cc; sourceTree = "<group>"; };
 		E48FB9610EC4EA270052B72B /* automation_autocomplete_edit_tracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = automation_autocomplete_edit_tracker.h; sourceTree = "<group>"; };
 		E48FB9620EC4EA270052B72B /* automation_browser_tracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = automation_browser_tracker.h; sourceTree = "<group>"; };
 		E48FB9630EC4EA270052B72B /* automation_constrained_window_tracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = automation_constrained_window_tracker.h; sourceTree = "<group>"; };
@@ -1726,6 +1772,7 @@
 		4D640CB90EAE863E00EBCFC0 /* renderer */ = {
 			isa = PBXGroup;
 			children = (
+				E45076D40F1538D2003BE099 /* automation */,
 				4D640CE00EAE868E00EBCFC0 /* net */,
 				4D640CBD0EAE868600EBCFC0 /* about_handler.cc */,
 				4D640CBE0EAE868600EBCFC0 /* about_handler.h */,
@@ -2559,6 +2606,9 @@
 				4D7BFC0A0E9D4C9F009A6919 /* time_format.cc */,
 				4D7BFC0B0E9D4C9F009A6919 /* time_format.h */,
 				4D7BFC0C0E9D4C9F009A6919 /* time_format_unittest.cc */,
+				E45076E30F153AB6003BE099 /* unzip.h */,
+				E45076E40F153AB6003BE099 /* unzip.cc */,
+				E45076E80F153B06003BE099 /* unzip_unittest.cc */,
 				4D7BFC0D0E9D4C9F009A6919 /* visitedlink_common.cc */,
 				4D7BFC0E0E9D4C9F009A6919 /* visitedlink_common.h */,
 				4D7BFC0F0E9D4C9F009A6919 /* win_safe_util.cc */,
@@ -2577,7 +2627,6 @@
 			children = (
 				4D7BFCA90E9D4D5D009A6919 /* chrome_canvas.cc */,
 				4D7BFCAA0E9D4D5D009A6919 /* chrome_canvas.h */,
-				4D7BFCAB0E9D4D5D009A6919 /* chrome_font.cc */,
 				4D7BFCAC0E9D4D5D009A6919 /* chrome_font.h */,
 				4D7BFCAD0E9D4D5D009A6919 /* color_utils.cc */,
 				4D7BFCAE0E9D4D5D009A6919 /* color_utils.h */,
@@ -2812,6 +2861,15 @@
 			name = webdata;
 			sourceTree = "<group>";
 		};
+		E45076D40F1538D2003BE099 /* automation */ = {
+			isa = PBXGroup;
+			children = (
+				E45076D60F1538E4003BE099 /* dom_automation_controller.h */,
+				E45076D70F1538E4003BE099 /* dom_automation_controller.cc */,
+			);
+			name = automation;
+			sourceTree = "<group>";
+		};
 		E48FB9600EC4EA270052B72B /* automation */ = {
 			isa = PBXGroup;
 			children = (
@@ -2855,28 +2913,18 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		4D640CE70EAE86BD00EBCFC0 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
 		4D640CEA0EAE86BD00EBCFC0 /* renderer */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 4D640D110EAE86FC00EBCFC0 /* Build configuration list for PBXNativeTarget "renderer" */;
 			buildPhases = (
-				4D640CE70EAE86BD00EBCFC0 /* Headers */,
 				4D640CE80EAE86BD00EBCFC0 /* Sources */,
 				4D640CE90EAE86BD00EBCFC0 /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				E45076D20F153891003BE099 /* PBXTargetDependency */,
 			);
 			name = renderer;
 			productName = renderer;
@@ -2887,7 +2935,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 4D7BF30A0E9D477E009A6919 /* Build configuration list for PBXNativeTarget "browser" */;
 			buildPhases = (
-				E45076760F152A31003BE099 /* Pre-Build */,
 				4D7BF3030E9D477E009A6919 /* Sources */,
 				4D7BF3040E9D477E009A6919 /* Frameworks */,
 			);
@@ -2895,6 +2942,7 @@
 			);
 			dependencies = (
 				4D7BFB290E9D4BC9009A6919 /* PBXTargetDependency */,
+				E450769D0F1534DD003BE099 /* PBXTargetDependency */,
 			);
 			name = browser;
 			productName = browser;
@@ -2948,6 +2996,7 @@
 			);
 			dependencies = (
 				4D7BFC1E0E9D4CCA009A6919 /* PBXTargetDependency */,
+				E450769F0F1534E8003BE099 /* PBXTargetDependency */,
 			);
 			name = common;
 			productName = common;
@@ -3098,6 +3147,7 @@
 			projectRoot = "";
 			targets = (
 				4D7BFB040E9D4B8C009A6919 /* All */,
+				E45076900F1532CE003BE099 /* Generate Headers */,
 				E45060E30EE87B86003BE099 /* app */,
 				4D7BF3050E9D477E009A6919 /* browser */,
 				4D7BFC190E9D4CB9009A6919 /* common */,
@@ -3391,19 +3441,19 @@
 			shellScript = "exec \"${XCODEPROJ_DEPTH}/build/mac/strip_from_xcode\"";
 			showEnvVarsInLog = 0;
 		};
-		E45076760F152A31003BE099 /* Pre-Build */ = {
+		E450768F0F1532CE003BE099 /* Run Shell Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Pre-Build";
+			name = "Run Shell Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -ex\nexec \"${PROJECT_FILE_PATH}/${PRODUCT_NAME}_prebuild.sh\" \"${@}\"";
+			shellScript = "set -ex\nexec \"${PROJECT_FILE_PATH}/${PRODUCT_NAME}.sh\" \"${@}\"";
 			showEnvVarsInLog = 0;
 		};
 		E4F325960EE837BF002533CE /* ShellScript */ = {
@@ -3428,7 +3478,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				4D640CF30EAE86E300EBCFC0 /* about_handler.cc in Sources */,
+				E45076D90F1538E4003BE099 /* dom_automation_controller.cc in Sources */,
+				E45076C90F1537F5003BE099 /* dom_ui_bindings.cc in Sources */,
+				E45076CB0F15380C003BE099 /* external_host_bindings.cc in Sources */,
 				B503E0F00F0175FD00547DC6 /* greasemonkey_slave.cc in Sources */,
+				E45076CF0F153871003BE099 /* localized_error.cc in Sources */,
 				4D640CF40EAE86EA00EBCFC0 /* render_dns_queue.cc in Sources */,
 				4D640CF50EAE86EF00EBCFC0 /* visitedlink_slave.cc in Sources */,
 			);
@@ -3541,6 +3595,8 @@
 				4D7BFCE70E9D4DD4009A6919 /* json_value_serializer_unittest.cc in Sources */,
 				B52E29BE0F0AA333008AD1C8 /* l10n_util_unittest.cc in Sources */,
 				4DDC63E70EAE344300FB5EBE /* metrics_response_unittest.cc in Sources */,
+				E450775F0F154036003BE099 /* mru_cache_unittest.cc in Sources */,
+				E45077620F15405C003BE099 /* notification_service_unittest.cc in Sources */,
 				4D7BFB580E9D4C43009A6919 /* page_range_unittest.cc in Sources */,
 				4D7BFB5F0E9D4C46009A6919 /* page_setup_unittest.cc in Sources */,
 				B562E2FC0F05845100FB1A4F /* property_bag_unittest.cc in Sources */,
@@ -3564,10 +3620,10 @@
 				B562E2D50F05834500FB1A4F /* chrome_canvas.cc in Sources */,
 				4D7BFC280E9D4CEB009A6919 /* chrome_constants.cc in Sources */,
 				4D7BFC2A0E9D4CED009A6919 /* chrome_counters.cc in Sources */,
-				B562E2C70F0582F800FB1A4F /* common_glue.cc in Sources */,
 				E4F3256E0EE82C83002533CE /* chrome_paths.cc in Sources */,
 				4D7BFC2C0E9D4CF1009A6919 /* chrome_switches.cc in Sources */,
 				4D7BFCC90E9D4D72009A6919 /* color_utils.cc in Sources */,
+				B562E2C70F0582F800FB1A4F /* common_glue.cc in Sources */,
 				4D7BFCCE0E9D4D7A009A6919 /* cookie_monster_sqlite.cc in Sources */,
 				4D7BFC2E0E9D4CF5009A6919 /* debug_flags.cc in Sources */,
 				4D7BFC330E9D4CF9009A6919 /* env_vars.cc in Sources */,
@@ -3588,14 +3644,18 @@
 				4D7BFC5C0E9D4D24009A6919 /* notification_service.cc in Sources */,
 				4D7BFC710E9D4D28009A6919 /* pref_member.cc in Sources */,
 				4D7BFC7A0E9D4D2B009A6919 /* pref_names.cc in Sources */,
+				E45076850F1530CD003BE099 /* pref_service.cc in Sources */,
 				B562E2F80F05843C00FB1A4F /* property_bag.cc in Sources */,
 				B5E98B140F0574A8000A37D6 /* render_messages.cc in Sources */,
+				E45076A90F153619003BE099 /* resource_dispatcher.cc in Sources */,
 				4D7BFC7F0E9D4D2E009A6919 /* slide_animation.cc in Sources */,
 				4D7BFC840E9D4D32009A6919 /* sqlite_compiled_statement.cc in Sources */,
 				4D7BFC8B0E9D4D35009A6919 /* sqlite_utils.cc in Sources */,
 				4D7BFC920E9D4D3A009A6919 /* task_queue.cc in Sources */,
 				4D7BFC970E9D4D3E009A6919 /* throb_animation.cc in Sources */,
 				4D7BFC9C0E9D4D46009A6919 /* thumbnail_score.cc in Sources */,
+				E45076AB0F153629003BE099 /* time_format.cc in Sources */,
+				E45076E50F153AB6003BE099 /* unzip.cc in Sources */,
 				4D7BFCA30E9D4D48009A6919 /* visitedlink_common.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3900,6 +3960,21 @@
 			target = 4D640CEA0EAE86BD00EBCFC0 /* renderer */;
 			targetProxy = E45063190EE990C4003BE099 /* PBXContainerItemProxy */;
 		};
+		E450769D0F1534DD003BE099 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = E45076900F1532CE003BE099 /* Generate Headers */;
+			targetProxy = E450769C0F1534DD003BE099 /* PBXContainerItemProxy */;
+		};
+		E450769F0F1534E8003BE099 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = E45076900F1532CE003BE099 /* Generate Headers */;
+			targetProxy = E450769E0F1534E8003BE099 /* PBXContainerItemProxy */;
+		};
+		E45076D20F153891003BE099 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = E45076900F1532CE003BE099 /* Generate Headers */;
+			targetProxy = E45076D10F153891003BE099 /* PBXContainerItemProxy */;
+		};
 		E4F3259B0EE837DD002533CE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = B5FDBFAD0EE4623000BEC6E6 /* ipc_tests */;
@@ -3924,6 +3999,19 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4D7BF2FF0E9D46E6009A6919 /* staticlib.xcconfig */;
 			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
+					"$(CONFIGURATION_TEMP_DIR)/generated/grit",
+					..,
+					../skia/include,
+					../skia/include/corecg,
+					../third_party/icu38/public/i18n,
+					../third_party/icu38/public/common,
+					../third_party/libjpeg,
+					../third_party/libxml/include,
+					../third_party/npapi,
+					"$(SYMROOT)/libxml.build/$(CONFIGURATION)/generated/include",
+				);
 				PRODUCT_NAME = renderer;
 			};
 			name = Debug;
@@ -3932,6 +4020,19 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4D7BF2FF0E9D46E6009A6919 /* staticlib.xcconfig */;
 			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
+					"$(CONFIGURATION_TEMP_DIR)/generated/grit",
+					..,
+					../skia/include,
+					../skia/include/corecg,
+					../third_party/icu38/public/i18n,
+					../third_party/icu38/public/common,
+					../third_party/libjpeg,
+					../third_party/libxml/include,
+					../third_party/npapi,
+					"$(SYMROOT)/libxml.build/$(CONFIGURATION)/generated/include",
+				);
 				PRODUCT_NAME = renderer;
 			};
 			name = Release;
@@ -4078,6 +4179,18 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4D7BF2FF0E9D46E6009A6919 /* staticlib.xcconfig */;
 			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
+					"$(CONFIGURATION_TEMP_DIR)/generated/grit",
+					..,
+					../skia/include,
+					../skia/include/corecg,
+					../third_party/icu38/public/i18n,
+					../third_party/icu38/public/common,
+					../third_party/libjpeg,
+					../third_party/libxml/include,
+					"$(SYMROOT)/libxml.build/$(CONFIGURATION)/generated/include",
+				);
 				PRODUCT_NAME = common;
 			};
 			name = Debug;
@@ -4086,6 +4199,18 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4D7BF2FF0E9D46E6009A6919 /* staticlib.xcconfig */;
 			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(HEADER_SEARCH_PATHS)",
+					"$(CONFIGURATION_TEMP_DIR)/generated/grit",
+					..,
+					../skia/include,
+					../skia/include/corecg,
+					../third_party/icu38/public/i18n,
+					../third_party/icu38/public/common,
+					../third_party/libjpeg,
+					../third_party/libxml/include,
+					"$(SYMROOT)/libxml.build/$(CONFIGURATION)/generated/include",
+				);
 				PRODUCT_NAME = common;
 			};
 			name = Release;
@@ -4178,6 +4303,20 @@
 			};
 			name = Release;
 		};
+		E45076910F1532CF003BE099 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = generate_headers;
+			};
+			name = Debug;
+		};
+		E45076920F1532CF003BE099 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = generate_headers;
+			};
+			name = Release;
+		};
 		E4F325980EE837BF002533CE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4294,6 +4433,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		E45076930F15330D003BE099 /* Build configuration list for PBXAggregateTarget "Generate Headers" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E45076910F1532CF003BE099 /* Debug */,
+				E45076920F1532CF003BE099 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		E4F325970EE837BF002533CE /* Build configuration list for PBXAggregateTarget "run_ipc_tests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (